Commit Graph

11841 Commits

Author SHA1 Message Date
Vile Beggar
c98d9d054b Properly adds a drill sergeant hat to the warden's locker (#42533)
* does the thing - please work

* adds it to the locker

* remove var/datum

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* Update code/modules/clothing/head/jobs.dm

adds space

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* adds denton's review suggestion

it's a webedit but i tested it and it worked

* makes it a bit less annoying

* grammar fix
2019-01-28 03:10:57 -05:00
Erik
0344b98df1 The spraycan now works on walls again. (#42519)
* Graffitis from the Spraycan now works on walls.

* Graffitis can be Sprayed on walls again.

* add a comment, rerun checks
2019-01-26 12:57:49 -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
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
Kierany9
8113154a22 The PR that fixed Assimilation (#42156)
lots of commits
2019-01-24 12:14:08 -05:00
PKPenguin321
1ab0c127dc [Ready] Adds a new power, Transcendent Olfaction, to genetics (#42414)
* adds Transcendent Olfaction to genetics
codersprite by me

* fixes
made messages work, added a new message
removed duplicate icon

* uses disgust instead of oxy damage

* addresses review
mostly changing usr to user. global mob list -> global carbon list since that's what i parse for anyways.
also changed a message.

* makes it compile
2019-01-25 03:35:50 +11: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
Time-Green
9861efde71 Cryokinesis and Geladikinesis mutations (#42453)
* Adds cryokinesis and renames the cold resistence file to space adaptation

* adds cryokinesis

* fixes icon conflict

is there actually a proper way to fix them thats not copying master and reimplimenting your own sprites?

* fixes a typo and lowers instability of cryokines by 5

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* maybe reverts line ending?

* unfucks flags?

* probably unfucks line endings

i swear to fucking god why does it even do this. i never even touched the file and reverting it to master doesnt do anything. fuck you git
2019-01-23 15:20:56 -05:00
Trilbyspaceclone
555f0bda23 Fixes power tool drill fitting in boots/wallet (#42476)
* Update wallets.dm

* Update pockets.dm

* Apply suggestions from code review

For when people forget how sister code works

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-01-23 14:32:04 -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
Tlaltecuhtli
010d61da04 [ready]rcd upgrades (#42388)
* rcdstuff

* e
2019-01-22 22:32:22 +11:00
PKPenguin321
a918476cf4 Two new electric powers for genetics (#42437)
* two new electric powers to genetics
Insulated - innate insuls
Shock Touch - Electric punch!

* fixed shock touch mutation and buffed it
also made it use electrocute_act() instead of flat burn damage, much nicer now
also added some vars to touch spells to let you set the draw/drop messages

* better internal logic
electrocute_act already checks for SHOCK_IMMUNE, so i dont need to do it
2019-01-22 22:06:29 +11: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
70a4fbf858 Merge pull request #42460 from anconfuzedrock/matterofthecart
Makes compressed matter cartridges tiny
2019-01-21 13:14:50 -05:00
anconfuzedrock
a17b4ec96f compresses compressed matter 2019-01-20 13:45:46 -05:00
Tad Hardesty
5c6f0edce6 Fix mousetrap boxes having no illustration 2019-01-19 23:02:54 -08:00
oranges
18200016d9 Bibles no longer runtime when changing bible style (#42411)
The correct icon states are restored, meaning yoru bitching necronomicon
can look cool now
2019-01-19 06:47:37 -07:00
oranges
55f6c039b3 Showers no longer runtime when you shower with an empty hand (#42410)
held items actually contains "null" entries by default using just var/I
gets these null items and then tries to wash_obj a null causing a
runtime

Specifying /obj/item will stop the nulls being iterated
2019-01-19 00:00:47 -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
Jordie
529b287312 Merge pull request #42320 from 81Denton/dusted
[Ready] Improves various supermatter messages
2019-01-18 23:22:30 +11: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
Dax Dupont
4f9d04bc32 This is a family friendly codebase (#42385) 2019-01-17 11:35:23 -05:00
tralezab
0633947862 Fix grammar in time desynchronizer (#42372) 2019-01-16 20:41:47 -08:00
granpawalton
4c8d35cbbe allows proffesion belts to hold their appropriate holosign (#42376) 2019-01-16 17:08:07 -05:00
Mickyan
ca84639286 Allows coloring objects with spray cans (#42327) 2019-01-16 16:43:04 -05:00
Jordan Brown
2af87bcd0d Merge pull request #42354 from tortellinitony/cig_refactor
Cigarettes extinguishing and vapes refactor
2019-01-16 13:58:08 -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
duckay
9cf3c5bbf8 Assistant Traitor Item: Part Electric Boogatwo (#42297)
* toolbox pls

* rstar

* Update uplink_items.dm

* contents, force

* i

* toolbox now costs 2 tc

robuster

* "toolbox"

* grammar mistake

* bust < bash

* description is better

A old, blue toolbox, it looks robust.

* changed bash skulls to bust heads

because i just watched the space station 13 video again

* yuh

* asdf

* throw!

* uplink now notes that it increases in damage
2019-01-15 12:13:36 -05:00
Jordan Brown
bf880ffde2 Merge pull request #42298 from coiax/spot-the-satchel
Fixes smuggler's satchels not being visible with t-ray
2019-01-15 09:27:08 -05:00
coiax
d8f84ca966 Desc/iconifies various pills, admin floorpill bottles (#42229)
* Renames aranesp, desc/iconifies various pills, admin floorpill bottles

* Unrenames
2019-01-14 17:32:40 -05:00
Denton
87ae58ef08 Merge remote-tracking branch 'tgstation/master' into dusted
at least it's not a map merge conflict
2019-01-14 21:29:05 +01:00
tortellinitony
7863c4a393 Add extinguishing to cigarettes and lighters. Makes vapes use container flags. 2019-01-13 13:00:48 -05:00
Jordie
9b1e965e1e Merge pull request #42306 from coiax/beer-googles-buff
The signature barman booze sliding is now granted by their beer goggles
2019-01-12 17:55:08 +11:00
Jordie
443aec87b2 Merge pull request #42302 from coiax/random-items-into-spawners
Changes the type pathing of some "random" items
2019-01-12 17:46:16 +11:00
oranges
8aa9a2a64a Merge pull request #42312 from Qustinnus/quickfix
initial hygiene tweaks
2019-01-12 10:41:44 +13:00
Denton
ffc1c52e73 Improves various supermatter messages 2019-01-11 13:52:40 +01:00
Unknown
145ac716cb done 2019-01-10 22:45:21 +01:00
Jack Edge
7e49d1d022 The signature barman booze sliding is now granted by their beer goggles
🆑 coiax
tweak: Bartenders now gain their ability to "booze slide" from their
beer googles, rather than from a granter book in their backpacks.
/🆑

Less action button clutter, the ability to disable it if required (at
the cost of style), still keeping it possible for non-roundstart bartenders
(provided of course, you have the shades for it), as well as a less
janky way of checking than just looking through someone's action
buttons.
2019-01-10 19:23:28 +00:00
Jordan Brown
95a5a1459c Merge pull request #42293 from coiax/fix-42269
Fixes ghosts and camera mobs feeling cold showers
2019-01-10 11:04:13 -05:00
Jack Edge
6945a367c3 Changes the type pathing of some "random" items
🆑 coiax
code: Randomly coloured gloves and randomly coloured glowsticks now have
slightly different typepaths, but otherwise function the same.
/🆑

Essentially, these items just acted AS spawners by qdeling in Initialize
(or at least hinting) and spawning a new totally seperate item.

There is nothing that uses the auto-equipping of random gloves, so I
removed it.
2019-01-09 22:50:52 +00:00
Jack Edge
4a2433317c Fixes smuggler's satchels not being visible with t-ray
🆑 coiax
fix: Smuggler's satchels can now be found with t-ray scanners, as
intended.
/🆑

Fixes #42296.

I used a trait because currently this is the only object that I'm aware
of that uses partial invisibility (because it wants to be visible to
ghosts), and it seems a waste to dedicate an entire obj_flag to one
item, or put a hardcoded typepath.
2019-01-09 19:31:53 +00: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
Jack Edge
cbf3b770dd Fixes ghosts and camera mobs feeling cold showers
🆑 coiax
fix: Ghosts and camera mobs no longer feel if the shower is cold or too hot.
/🆑

Fixes #42269.

- In addition, replaces some "the shower" with [src].
2019-01-09 18:27:14 +00:00
Denton
a8e55f5ce4 Restricts magspear throw_range 2019-01-08 17:42:16 +01:00
coiax
ffd160a495 Readds non-persistent contraband filled smugglers satchels (#42228)
* Readds non-persistent contraband filled smugglers satchels

* Ten random satchels are placed each round
2019-01-07 21:16:47 +11:00
coiax
cf0bb75600 Glowing goo glows more; roundstart goo contains radium or uranium (#42235)
* Glowing goo glows more, and always contains radium

🆑 coiax
tweak: Glowing goo now glows a lot more noticably in the dark, and
always contains radium.
/🆑

You can barely see it in the dark, should glow more. Also, the normal
in-game method of creating it is spilling radium on the floor, so all
glowing goo should have radium in it, even the roundstart stuff.

* Roundstart goo now contains either radium or uranium

* Radium is now a subtype of uranium, because nearly-identical behaviour
2019-01-07 21:07:54 +11:00
Militaires
37f6d2fa1d corrects Hippocrates bust description (#42244)
* corrects Hippocrates bust description

* cited >> referred to
2019-01-07 19:26:56 +13:00
coiax
56305454bf Cleans up shower code (#41884)
cl coiax
fix: Monkey cubes now expand in a running shower!
fix: Slimes now die in running showers.
/cl

Showers now apply 200 water reagent via TOUCH every tick to anything under them.
This doesn't actually add reagent to the atoms it touches though.
Showers now use timers rather than spawn for the mist creation.
Mist isn't recreated every time the shower is turned on and off.
All living mobs are burned by hot showers, not just carbons.
This means that slimes are healed by hot showers.
Showers are now in a separate file.
Shower temperatures now use defines.

Fixes #41773.
2019-01-07 19:20:45 +13:00