Skip to content

erp removals PR #5434634245234234235564523453564565675987432958230705825602345902348759823468=2597684576832457546872968y934805732409587-3246734-567543563456#348

Open
ghost wants to merge 14 commits intomasterfrom
fart-huffing
Open

erp removals PR #5434634245234234235564523453564565675987432958230705825602345902348759823468=2597684576832457546872968y934805732409587-3246734-567543563456#348
ghost wants to merge 14 commits intomasterfrom
fart-huffing

Conversation

@ghost
Copy link

@ghost ghost commented Jun 23, 2021

About The Pull Request

Why It's Good For The Game

Changelog

🆑
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

@ghost ghost changed the title Gay removals PR #5434634245234234235564523453564565675987432958230705825602345902348759823468=2597684576832457546872968y934805732409587-3246734-567543563456 erp removals PR #5434634245234234235564523453564565675987432958230705825602345902348759823468=2597684576832457546872968y934805732409587-3246734-567543563456 Jun 23, 2021
@ghost
Copy link
Author

ghost commented Jun 23, 2021

@ghost
Copy link
Author

ghost commented Jun 23, 2021

synthlizgone

"Medical" = image(icon = 'icons/mob/robots.dmi', icon_state = "synd_medical"),
"Assault" = image(icon = 'icons/mob/robots.dmi', icon_state = "synd_sec"),
"Heavy" = image(icon = 'modular_skyrat/icons/mob/moreborgsmodels.dmi', icon_state = "syndieheavy"),
"Miss m" = image(icon = 'modular_skyrat/icons/mob/moreborgsmodels.dmi', icon_state = "missm_syndie"),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot to delete the sprites for the drake, hound, and other borgs.

/obj/item/clothing/head/hooded/winterhood/durathread
icon_state = "winterhood_durathread"
armor = list("melee" = 20, "bullet" = 8, "laser" = 15, "energy" = 8, "bomb" = 25, "bio" = 10, "rad" = 15, "fire" = 75, "acid" = 37, "wound" = 7)
armor = list("melee" = 15, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 20, "bio" = 15, "rad" = 10, "fire" = 5, "acid" = 50, "wound" = 15)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based re-balance. But keep it fire resistant.

@@ -132,10 +132,6 @@ GLOBAL_LIST_INIT(combat_music_options, list( // Skyrat addition
var/bloodcolor = ""
var/skyrat_ooc_notes = ""
var/erppref = "Ask"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping normal ERP, based.

desc = "A beanie made from durathread, its resilient fibres provide some protection to the wearer."
icon_state = "beaniedurathread"
armor = list("melee" = 25, "bullet" = 10, "laser" = 20,"energy" = 10, "bomb" = 30, "bio" = 15, "rad" = 20, "fire" = 100, "acid" = 50, "wound" = 15)
armor = list("melee" = 15, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 20, "bio" = 15, "rad" = 10, "fire" = 5, "acid" = 50, "wound" = 15)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fuck you don't nerf Durathread!!!11!!1

@@ -1647,70 +1647,6 @@
var/client/cli = M.client
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be best to just delete this entire file, ERP verbs are cringe. /me's are better.

@Fajetti
Copy link

Fajetti commented Oct 26, 2021

e10

reviewing a PR that doesn't have anyone working on it for over a month

@Moltovz
Copy link

Moltovz commented Oct 26, 2021

e10

reviewing a PR that doesn't have anyone working on it for over a month

Not realizing the reviews are satire

@Fajetti
Copy link

Fajetti commented Oct 26, 2021

e10

reviewing a PR that doesn't have anyone working on it for over a month

Not realizing the reviews are satire

https://www.youtube.com/watch?v=zwcUw3wAHjY

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants