Commit Graph

11824 Commits

Author SHA1 Message Date
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
81Denton
cd3d97c1a6 Reworks spearguns, adds Syndicate bundle, carp clothing adds carp faction (#42102)
* Reworks magspears, adds Syndicate bundle, carp clothing adds carp faction

* 20 magspears

* Replaces bandolier with quiver

* Slightly increases throwforce to OHKO space carps
2019-01-07 19:19:45 +13:00
coiax
074b2f942e Die of fate tweaks and fixes (#42073)
* Die of fate tweaks and fixes

🆑 coiax
fix: Rolling a 6 with a die of fate now reduces your speed as intended.
fix: Rolling an 8 with a die of fate will cause the explosion to be
around the roller, not the die.
tweak: Die of fate effects now make loud visible messages so it's
obvious what has happened.
admin: Dice can now be "totally rigged" with admin edits to
unconditionally always roll a certain value, rather than just some of
the time. A new "cursed die of fate" has been added to demonstrate this
effect.
/🆑

- new proc `do_smoke` that does basic smoke effects, to avoid the same
pattern for making smoke effects.
- Dice rigging has been split into two vars, "rigged" for the severity
of the rigging (not rigged, basically rigged, totally rigged), and
rigged_value for the value it's trying to rig to.

* Stealth die of fates

* Code review II?
2019-01-07 19:17:45 +13:00
subject217
8e887f12a4 Plastitanium walls are no longer evil (#42217)
This description doesn't really make much sense when people use them for flavor
on stations and sometimes to make entire NT shuttles out of. So it's no longer
evil.
2019-01-06 14:12:50 -08:00
oranges
e7393d7d2d Merge pull request #42205 from 81Denton/ghost-sounds
Reduces sound volume for some ghost notifications
2019-01-06 21:40:40 +13:00
Tad Hardesty
3b2c0e27f7 Scope various unscoped locate() calls (#42195)
* Scope locate calls which are immediately checked against a list

* Remove silly use of locate from bible Topic

* Scope various locate calls (needs testing)

* More WIP

* Buff up lightswitches while we're here

* Tidy record browsing code

* Scope a few more locates

These have caused problems in the past (#41917, #39303). Continues #29349.

Also cleans up lightswitch code while I was already touching it.

I recommend a testmerge.
2019-01-06 20:39:27 +13:00
WJohn
3a23c4560b Redesign the Raven Battlecruiser escape shuttle (#42211)
This new shuttle is significantly more usable than the hideous lopsided garbage
we had before. The turrets can actually fire at nuke ops and won't kill ian
anymore. It also has shields you can enable to give you extra protection from
boarders or meteors, and the bridge can thoroughly lock itself down with blast
doors to enter it, and on the windows. These turrets can also be disabled in the
bridge, if you like.

This shuttle now costs 30k, up from 15k, since it's an actually useful shuttle
now. Gotta pay for your security!
2019-01-05 15:02:05 -08:00
Jordan Brown
27138810ad Merge pull request #42197 from coiax/fixes-spontaneous-brain-trauma-runtime
Fixes Spontaneous Brain Trauma runtimes
2019-01-04 10:15:14 -05:00
nicbn
c4213f13ab New() -> Initialize() (#41876) 2019-01-03 18:56:15 -08:00
oranges
8736493c02 Merge pull request #42182 from coiax/fixes-void-popping
Fixes mobs being left in inconsistent state with the Void mutation
2019-01-04 13:15:10 +13:00
Denton
24c71eb7a7 Reduces sound volume for some ghost notifications 2019-01-03 10:49:41 +01:00
Jack Edge
c70aeb8dc9 Fixes Spontaneous Brain Trauma runtimes
🆑 coiax
fix: The Spontaneous Brain Trauma event now has a range of possible severities,
and no longer runtimes.
/🆑

In addition, I changed the description/names of some pills to make them more
accurate, and added some neurine pills, because I needed them for testing.

With thanks to @oranges for spotting the runtime in the first place.
2019-01-02 23:25:33 +00:00
duckay
e69901d6dc chance to get the standard red spacesuit from syndicate space suit boxes (#42147)
* Update uplink_kits.dm

* Update uplink_kits.dm

* Update uplink_kits.dm

* gringo

* dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
2019-01-02 15:54:00 -05:00
subject217
5a52f8a7bf Removes smugglers satchels (#42166)
* Removes smugglers satchels

I love the cutie reading this

* remove smuggler's satchel from code

* removes all smugglers' satchel persistence code

* removes remaining things

storage component for smugglers, the miracle ruin (uses smugglers), the dme
2019-01-02 15:28:26 -05:00
4dplanner
9e962ff5b7 Transparent protection for clothing [READY] (#42075)
* Transparent_protection

* No longer protects captain mask

webedit?

* Use NONE
2019-01-02 15:23:10 -05:00
Qustinnus
62f61a5867 [READY]New durathread content and durathread modifications (#41959)
* durayeet

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

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

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

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

* Update code/modules/clothing/masks/miscellaneous.dm

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

* Update code/modules/clothing/under/miscellaneous.dm

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

* yeet

* adds armor

* webedits yeet

* adds crafting stuff and removes normal cloth crafting

* ff

* final fixes

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

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

* done
2019-01-02 14:31:06 -05:00
Jack Edge
18376b12b1 Fixes mobs being left in inconsistent state with the Void mutation
🆑 coiax
fix: Humans with the Void mutation will no longer be able to enter the void
while inside something else (eg. cloning pod, cryotube) willingly or unwillingly.
/🆑

- I refactored immortality talisman effects to stop all this ugly ass code
reusing, and stop the weird modification of the speech invocation.
- I added DNA injectors for the Void mutation for testing.
2019-01-01 23:27:57 +00:00
Qustinnus
0de28b726a [READY]Humans now have hygiene (DOES NOT AFFECT MOOD GO AWAY MOODPOSTERS) (#41986)
cl Floyd / Qustinnus
tweak: You now have to be naked to get the nice shower moodlet, if you shower with clothes you get a bad moodie
add: Hygiene, you slowly become dirty over time, the more covered in blood you are the faster you will lose hygiene. When you are too dirty you will have a stink overlay. (Hygiene doesn't affect mood currently) It also spawns miasma slowly if you smell like shit.
add: adds NEET and neat traits. NEET's get 20 bucks social welfare extra and like being unhygienic, while neat people dislike being unhygienic and like being hygienic
/cl

This doesn't affect mood so plssss dont strawman in this PR about how I'm forcing you to shower or die or whatever

This PR is mostly visual and will allow for people to judge others for literaly being smelly as hell.

also NEET and neat traits which interact with being smelly. (neat likes hygiene, dislikes lack of it. NEETs like lack of hygiene and get some social welfare (20 bucks))
2019-01-02 01:04:51 +13:00