Commit Graph

11019 Commits

Author SHA1 Message Date
ShizCalev
f09b0e7b44 fixed pronouns 2019-02-02 19:16:59 -05:00
ShizCalev
39c3ceff7e Fixes petting mood stacking 2019-02-02 17:16:15 -05:00
oranges
61f7ee1357 Revert "adds handholding"
This reverts commit 106937961c.
2019-01-31 07:05:04 +00:00
oranges
f6f2f09867 Merge remote-tracking branch 'nervere/patch-1' into upstreamasterunsafe 2019-01-31 07:04:51 +00:00
Nirnael
812adf7cc0 Fix another dirty boy null pointer (#42591) 2019-01-29 23:32:08 -08:00
nervere
106937961c adds handholding 2019-01-29 21:04:31 -05:00
Jordie
8019c76bd5 Merge pull request #42560 from ShizCalev/cleanbot
Cleanbot now cleans up salt and plant smudges
2019-01-29 23:40:45 +11:00
kevinz000
5d4143f923 Emergency projectile fix #42544
Okay, oranges was right and I'm stupid.
Stops the server from crashing from a beam rifle, jesus.
2019-01-28 20:22:32 +13:00
ShizCalev
35670e8832 Cleanbot now cleans up salt and plant smudges 2019-01-28 01:16:46 -05:00
leon2550
23fc38af7e Increase drop chance for Crusher trophies (#42481)
it takes way too long to get a crusher trophy as is, and it kinda makes crushers pointless. so i increased the drop chance to about 1 in 4 instead of 1 in 20. also, first PR, yay.
2019-01-27 21:10:10 -05:00
fluffe9911
d78bb9152b Adds the golem Time-Green was too communistic to add (#42475)
* capitalism is the true way

* better sound clip

* there we go

* fixes mine and time-greens copy pasta

* adds the soviet golem to the human file

* capatalist golems now bleed money

* makes it so both capatlist and soviet golems can now use guns

* hec

* makes the song the U.S.A Anthem to please the copyright gods and removes money bleeding cause im to lazy to do a refactor right now

* Update code/modules/mob/living/carbon/human/species_types/golems.dm

Co-Authored-By: fluffe9911 <dablank02@hotmail.com>

* re

* better sound clip
2019-01-25 15:38:07 -05:00
4dplanner
87ba21090c Megafauna cannot teleport (#42479)
Megafauna cannot teleport
2019-01-25 10:17:54 -05:00
YoYoBatty
a3015ac893 Bodypart received damage is run through armor check in certain situations (#42462)
* Refactors the way bodypart damage is applied

* Update bodyparts.dm

* Update damage_procs.dm

* Update damage_procs.dm

* Update damage_procs.dm

* Update damage_procs.dm

* Update bodyparts.dm

* Update damage_procs.dm

* Update carbon.dm

* Update twohanded.dm

* Update damage_procs.dm
2019-01-24 16:11:52 -05:00
Erik
517128a53f Adds a proper TRAIT_RADIMMUNE check to the portable scanner and cloner. (#42489)
* ok

hi

* Add TRAIT_RADIMMUNE check to the portable gene scanner and to cloning

* Add TRAIT_RADIMMUNE check to the portable gene scanner and to cloning

* Implemented Suggestions.

* "No Sir, im not a synth, check my DNA!"

* You got it Boss

* Remove a useless Return

Co-Authored-By: Gousaid67 <gousaid67@gmail.com>

* Add a comment, also rerun checks
2019-01-25 03:33:16 +11:00
Jordie
ad19c17660 Merge pull request #42490 from tgstation/Cyberboss-patch-1
Removes copypasta from synth code
2019-01-25 02:42:57 +11:00
Jordan Brown
fe474bc0ab Merge pull request #42478 from WarJenkins/gasbag-no-smell
Plasmamen don't have to shower anymore
2019-01-23 12:23:15 -05:00
Jordan Brown
fd3f3636eb Removes copypasta from synth code 2019-01-23 09:01:43 -05:00
Menshin
9dabcbbb04 Fixes for projectiles bugs (#42463)
* Bandaid fixes for bugs with reflectors projectiles and plasma cutters

* * Fixed bouncing piercing projectiles on qdel
* Fixed projectiles reflection not working
* Fixed heavy beam pulses not penetrating
* Changed numerous projectiles procs to use the new BULLET_ACT_* format

* Final conversions to new BULLET_ACT_* format
2019-01-23 21:00:11 +13:00
Vile Beggar
421ed22471 cl Vile Beggar
tweak: Plasmamen have no need for regular showering anymore.
/cl

why: there's no reason for plasmamen to be semlly, they're just skeletons after all, are they not?
2019-01-22 18:55:46 +01:00
4dplanner
ea4234cd81 legion cores remove CC instead of adminhealing [READY] (#42378)
* legion cores remove CC

* legion -> regenerative

* lore

* Icons

fixes last reference to legion core in status

* Automatic creation of classes is possibly the worst feature of all time

* Moves remove_CC

* Review changes
2019-01-22 11:57:53 -05:00
Time-Green
b245f1ed5a Adds the golem Qustinnus was REALLY too afraid to add (#42402)
Stalinium is currently unavailable, so it's an admin only golem
cl Time-Green
rscadd: Adds glorious soviet Russia golem
/cl
2019-01-22 15:30:46 +13:00
Jordan Brown
62d00acbb7 Merge pull request #42457 from tgstation/MrStonedOne-patch-1
Partial revert of `Minor refactors` (#26305) by @Cyberboss
2019-01-20 18:41:27 -05:00
Dangerous dingidy doo
dd383a07c5 Bone golems rattle and speak like skeletons do (#42436)
All skeletons no matter what must rattle together to unify against their
non-skeleton oppressors.
2019-01-20 14:32:06 -08:00
Kyle Spier-Swenson
53b07ce8ef Update login.dm 2019-01-20 08:32:16 -08:00
Kyle Spier-Swenson
0d85b8b4c6 Partial revert of Minor refactors (#26305) by @Cyberboss
Partial revert of `Minor refactors` (#26305) by @Cyberboss
2019-01-20 08:29:11 -08:00
Qustinnus
06171c1a79 Fix hygiene runtimes, lighten sprite (#42404)
Hygiene sprite is a bit more transparent.
2019-01-18 14:22:09 -08:00
kevinz000
7370de6961 Fixes projectiles not hitting people resting, a bit of refactoring of how projectile target collision is done (#42241)
* Fixes projectiles not hitting mobs, some refactoring too

* some stuff for projectile can hit target to work with not being ontop of an object

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* CanPass returns true to projectiles regardless of hit

* snakecase?
2019-01-19 11:17:42 +13:00
coiax
c3e948495b Fixes not being able to insert objects into closets, and being unable to throw (#42407)
cl coiax
fix: Objects and items can now be inserted into closets, like before.
fix: Fixes a bug which prevented carbons from throwing items.
/cl

Essentially, the original way the insert() proc was structured, I
overlooked an else-if chain that was skipped if something was an item,
because I thought it only existed to type-check the item to access its
flags.

These are the changed lines from the NODROP PR. https://github.com/tgstation/tgstation/pull/42109/files#diff-2b130b854bf2e2a5e76320246520eea4L171

closes #42109
2019-01-19 11:12:31 +13:00
tralezab
a89c5aee03 [READY] petting all dogs makes you happy, petting cats now makes you happy #freepugs (#42373)
fixes #42361
closes #42363

i changed the moodlet instead of where the wuv proc is, so it should pick the initial name of the dog and say something like "pugs are so adorable! i can't stop petting them!" but for all kinds of dogs

the only thing is that this name doesn't change if you pet a pug and then a corgi because they are classified as the same buff, i could make the name of the buff the same as the mob you are petting so you could stack happiness but that would be a balance change, imagine how happy you could get locked in a room with every kind of dog in the game
2019-01-19 00:13:04 +13:00
4dplanner
7c1445dbf2 Hierophant burst is async (#42290)
I noticed that I had 4 hierophant kills logged on the stats hub, which is off
by about an order of magnitude. What happens is that on death hierophant
releases an expanding square, which you're meant to run from - this puts you
out of range for the medal.
2019-01-18 01:43:34 -08:00
coiax
881e8c1ab9 Refactors NODROP flag into TRAIT_NODROP (#42109)
* Refactors NODROP flag into TRAIT_NODROP

🆑 coiax
fix: Anti-drop implants can no longer be used to drop objects that they
were not responsible for sticking to a person's hand.
fix: Backfiring with a Barnyard spellbook will now play a spooky horse sound.
refactor: Refactors the way that "NODROP" items work to a new system,
there should be no change in functionality.
/🆑

Various items in the codebase were doing weird hoop jumps in order to
preserve the nodrop flag's state when it also wanted to change it, so I
moved it to a trait system.

I may have gone overboard with the type of unique trait sources, but
those can be changed later. My long term plan is make a general "CURSED"
nodrop origin, which means you can unlock cursed items by being hit with
a bolt of door opening or something. But that's for another PR, this has
no functionality changes, apart from some slightly modified descriptions
on cursed masks.

- Removed a bunch of redundant voice changing code for all the voice
changing animal masks, used two new clothing flags for this purpose.
- Also refactored a bit the animal masks, making new cursed subtypes that play
the sound when created.

* Drop location
2019-01-17 15:24:30 -05:00
Qustinnus
e1d360ff05 [ready] Golem DLC pass 2018 (Adds new golem types) (#41951)
* Bronze golem

* adds creation

ad

* removes shit adds shit

* temp

* fff

* bone, leather and cardboard

* fff

* boneyard

* temp

* ahahahha dumb moron

* adds durathread golem sprites

* reee

* ass

* Auto stash before merge of "golemgang" and "origin/golemgang"

* fix

* uuh

* d

doned

* remove dupe
2019-01-16 13:42:20 -05:00
coiax
dd22f63ca8 Fix communication disorder plus mutadone causing chat spam (#42340) 2019-01-15 17:18:22 -08:00
bgobandit
aeb603cb40 Clicking the health doll lets you examine yourself for injuries (#42357) 2019-01-15 17:12:29 -05:00
bgobandit
4466609c9e Resisting out of bucklecuffs takes an amount of time dependent on cuffs used. (#42344)
* Resisting out of bucklecuffing will now take different amounts of time based on the cuffs used.

* removes stray reference to "one minute"

* makes cobby's change
2019-01-15 12:11:32 -05:00
Time-Green
6295991056 fixes mutations instantly activating on species change 2019-01-12 18:24:05 +01:00
oranges
8aa9a2a64a Merge pull request #42312 from Qustinnus/quickfix
initial hygiene tweaks
2019-01-12 10:41:44 +13:00
Qustinnus
31c19654e0 reworks emote sound code & adds screaming (Which only works if the code forces it. *scream wont make a sound) (#42216)
* done

* adds moth scream

* Update code/datums/emotes.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/datums/emotes.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/datums/emotes.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/datums/emotes.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* 1

* fixed

* fixed

* wew
2019-01-11 13:43:03 -05:00
coiax
73df5f541d Fixed slaughter demon exit speed boost (#42236)
🆑 coiax
fix: Fixed slaughter demons not getting a speed boost when exiting a
pool of blood. Fixed slaughter demon giblets not being visible.
/🆑

- Also switches some spawn() to timers, and got rid of a var on
slaughter demon previously tracking speed boosting.
2019-01-11 18:15:12 +13:00
Whoneedspacee
c913364e54 [READY] Ash Drake bug fixes and edits (#42251)
cl Joe Berry
add: Mass fire attack, sends fire out from the ash drake in all directions
add: Adds an enraged attack for ash drake, heals him as well as making him glow and go faster, spawning massive amounts of fire in all directions
del: Removes the old triple swoop with lava pools attack
tweak: Lava pools can now spawn with the normal fire breath attack sometimes
tweak: Lava pools now have changed delays for lesser amounts so they don't all just place around one area
tweak: Increases default swoop delay for #41178
balance: Teleporting out of the lava arena now has some actual consequences by enraging the ash drake
fix: Makes lava arena a bit less laggy by not recalculating range_turfs every time
fix: Fixes #41887 though this will not change the turfs to basalt temporarily to prevent moving through indestructible walls
fix: Fire lines would not spawn if their range would place their final turf location outside of the map
fix: The arena attack will no longer destroy indestructible open turfs
/cl

[why]: Just some bug fixes and prevents some cheese weirdness when people teleport out of the lava arena. The lava arena attack would continue going even when there was nobody in the arena. Also increasing the delays on the swoop attacks makes it feel less like it's chaining attacks like lava arena over and over. The triple swoop with lava pools was tedious as best and I think this attack is more massively threatening for a second phase attack.
2019-01-11 18:14:08 +13:00
Unknown
145ac716cb done 2019-01-10 22:45:21 +01:00
Jordan Brown
8964783c7c Merge pull request #42169 from optimumtact/speciesgenesfail
Code no longer runtimes on species change for mobs
2019-01-10 13:39:29 -05:00
oranges
5b792193b8 Code no longer runtimes on species change for mobs
on species change was removing the inert mutation (from the mutation
index and mutation list) before trying to find it in that same list and
checking the index.

Instead we get the index first and then remove it
2019-01-09 21:49:06 +00:00
Jordan Brown
cd4b123a3a Removes html from medibot emergency declaration (#42266) 2019-01-09 14:02:43 -05:00
coiax
00b53b276a Improves quality of flavoured cigarettes (#42181)
* Improves quality of flavoured cigarettes

* Menthol cigs taste equally of smoke and mint while still buffing
2019-01-09 14:00:54 -05:00
Jordan Brown
d37f093cd4 Merge pull request #42277 from coiax/dead-dont-sweat
Dead people do not suffer hygiene problems, as they are busy decomposing
2019-01-09 11:06:01 -05:00
Jordan Brown
5da26c6821 Merge pull request #42149 from FrostyFridge/selfsurgery
Allows mechanical organ manipulation to be performed on your own augmented body parts
2019-01-08 16:12:31 -05:00
Jack Edge
fdb817dcc5 Dead people do not suffer hygiene problems, as they are busy decomposing
🆑 coiax
tweak: Dead bodies do not slowly have their hygiene decrease, as dead
bodies just smell generally because of the decomposition.
/🆑

We already have dead bodies rotting miasma, they don't need green stink
clouds as well.
2019-01-08 11:21:57 +00:00
Jack Edge
fb68cf3ad3 Podpeople are always clean
🆑 coiax
add: Podpeople have the species trait of always being clean, so do not
need to worry about regular showering. Because they're plants.
/🆑

Someone suggested this, and maybe this makes sense for podpeople? They
should shower because they're thirsty, not because they smell.
2019-01-07 18:55:39 +00:00
subject217
edf1c210f1 removes the speedmod var from plasmamen (#42245)
inherited value is fine thanks
2019-01-07 09:56:24 -05:00