Commit Graph

9491 Commits

Author SHA1 Message Date
Poojawa
c579d81f4c Vore fixes and a few additions (#6032)
* Fixes saving memes, Adds absorbing and OOC escape

Also allows for people to reload from a slot if they fuck up and delete a belly

* makes sure travis won't flip the fuck out

* fixes some sound issues

* cleaning up some extra sounds, also dragon vore sound settings

* fixes resisting out of guts

* BRACKETS

* Prey now become blind after being eaten.

Use the audible subtle message to continue roleplaying with them!

* Actually make bulges show up in examine

* Fixes cases where transfering between bellies would blind twice

Because, y'know, that make sense. Also added self reminders if any changes happen to JSONs
2018-03-26 04:46:50 -05:00
CitadelStationBot
bf63fa766a [MIRROR] Adds sync to tgdb button for permission panel (#6086)
* Merge pull request #36413 from Jordie0608/ifyoupressthisbuttonthreetimesatmidnighttheghostoferroragewillstealyourholder

Adds sync to tgdb button for permission panel

* Adds sync to tgdb button for permission panel
2018-03-26 04:40:12 -05:00
CitadelStationBot
1c5081af32 [MIRROR] Logs abductor chat (#6114)
* Logs abductor chat (#36713)

* Logs abductor chat
2018-03-26 04:33:28 -05:00
CitadelStationBot
5dabd9cb05 [MIRROR] Prevents sparks from passing through clockcult rifts (#6111)
* Prevents sparks from passing through clockcult rifts

* Prevents sparks from passing through clockcult rifts (#36692)

* Prevents sparks from passing through clockcult rifts

* Update city_of_cogs_rift.dm
2018-03-26 04:31:59 -05:00
CitadelStationBot
de697be536 [MIRROR] Fix unwrenching and placing directional signs (#6106)
* Fix unwrenching and placing directional signs

* Merge pull request #36677 from AutomaticFrenzy/patch/sign-backings

Fix unwrenching and placing directional signs
2018-03-26 04:30:33 -05:00
CitadelStationBot
3fef96e3d1 [MIRROR] Fixes ninja objectives remaining when ninja antag removed (#6105)
* Merge pull request #36672 from YPOQ/objectivefix

Fixes ninja objectives remaining when ninja antag removed

* Fixes ninja objectives remaining when ninja antag removed
2018-03-26 04:30:03 -05:00
CitadelStationBot
29a4af95c2 [MIRROR] Fixes imaginary friend trauma (#6104)
* Fixes imaginary friend trauma (#36647)

* Fixes imaginary friend trauma
2018-03-26 04:29:31 -05:00
CitadelStationBot
d4738d4676 [MIRROR] Fixes air alarm values (#6103)
* air alarm values (#36629)

* Fixes air alarm values
2018-03-26 04:29:12 -05:00
CitadelStationBot
b8cc4e2d76 [MIRROR] Fixes Mush Punch (#6102)
* Fixes Mush Punch (#36631)

* sometimes you just gotta own up to your mistakes :(

* I'm gonna be the best friend you have to ask for yourself to be the most things I can tell 

Real shit

* Fixes Mush Punch
2018-03-26 04:28:53 -05:00
CitadelStationBot
ec0be681cb [MIRROR] Fixed Ranged Guardian moving when recalled (#6101)
* Fixed Ranged Guardian moving when recalled (#36643)

* Fixed Ranged Guardian moving when recalled
2018-03-26 04:28:27 -05:00
CitadelStationBot
216aef40f1 [MIRROR] Topic will no longer be called on deleted objects (#6100)
* Merge pull request #36666 from tgstation/Cyberboss-patch-3

Topic will no longer be called on deleted objects

* Topic will no longer be called on deleted objects
2018-03-26 04:28:07 -05:00
CitadelStationBot
9f5682fa35 [MIRROR] New torch sprites, fixed missing inhands (#6099)
* New torch sprites, fixed missing inhands

* missing sprites
2018-03-26 04:27:30 -05:00
CitadelStationBot
bb1aaf01e7 [MIRROR] Plastic flaps are now airtight (#6098)
* Plastic flaps are now airtight (#36659)

* flaps

* fucking flaps, how do they work?

* Plastic flaps are now airtight
2018-03-26 04:20:12 -05:00
CitadelStationBot
4f254f181f [MIRROR] Sintouched antag datums (#6096)
* Sintouched antag datums (#36561)

* Sintouched stuff

* hudz

* These are boring and when they happen they happen en masse so let's just list them

* undefs

* Sintouched antag datums
2018-03-26 04:19:49 -05:00
CitadelStationBot
3e25c34dbc [MIRROR] Turret's process() is now 52% more efficient (#6107)
* Turret's process() is now 52% more efficient

* Turret's process() is now 52% more efficient (#36662)

* 52% more efficient process()

* Less unecessary popdown calls

* webediting
2018-03-25 20:22:55 -07:00
Ziiro
b70381c89e Adds IPC Antennas (#6049) 2018-03-24 12:33:19 -07:00
CitadelStationBot
92c868a829 [MIRROR] Prevents overriding shuttle areas (#6081)
* Prevents overriding shuttle areas

* Prevents overriding shuttle areas
2018-03-22 19:33:43 -05:00
CitadelStationBot
c96253c376 [MIRROR] Fixes incorrect first death mob name (#6080)
* Fixes incorrect first death mob name

* Fixes incorrect first death mob name
2018-03-22 19:32:40 -05:00
CitadelStationBot
80d5cc2884 [MIRROR] Nerfs monkey spam (#6084)
* Merge pull request #36380 from vuonojenmustaturska/sauerbraten

Nerfs monkey spam

* Nerfs monkey spam
2018-03-22 19:31:57 -05:00
CitadelStationBot
33f24d9e2d [MIRROR] Adds missing "to" in admin prison TP message (#6079)
* Adds missing "to" in admin prison TP message

* Adds missing "to" in admin prison TP message
2018-03-22 19:31:01 -05:00
CitadelStationBot
8321484d4d [MIRROR] Fixes swarmers getting killed by shocks (#6075)
* Fixes swarmer electrocution (#36596)

* Fixes swarmers getting killed by shocks
2018-03-22 19:30:37 -05:00
CitadelStationBot
69ddb63bb4 [MIRROR] Fixes asclepius rod runtime (#6074)
* Fixes asclepius rod runtime (#36595)

* Fixes asclepius rod runtime

* isanimal

* Fixes asclepius rod runtime
2018-03-22 19:30:09 -05:00
CitadelStationBot
e6c74cc0da [MIRROR] Count gorilla transforms (#6072)
* Count gorilla transforms (#36563)

* Count gorilla transforms
2018-03-22 06:12:46 -05:00
CitadelStationBot
c618b30214 [MIRROR] Fixes cells being deleted from chem dispensers on deconstruction (#6071)
* adds cell = null to deconstruct (#36589)

* Fixes cells being deleted from chem dispensers on deconstruction
2018-03-22 06:12:28 -05:00
CitadelStationBot
83a2cda51f [MIRROR] Fix ventcrawl breathing and visuals (#6069)
* Fix ventcrawl breathing and component icons (#36591)

* Fix ventcrawl breathing and visuals
2018-03-22 06:12:07 -05:00
CitadelStationBot
b02180de44 [MIRROR] fixes airlock audio inconsistency (#6068)
* fixes airlock audio inconsistency (#36574)

* fixes inconsistency

* replaces sound

* src

* fixes airlock audio inconsistency
2018-03-22 06:11:42 -05:00
CitadelStationBot
4f6fc9affa [MIRROR] fixes lava planet appearing in transit / wrong z level (#6067)
* boom goes the dynamite (#36590)

* fixes lava planet appearing in transit / wrong z level
2018-03-22 06:11:08 -05:00
CitadelStationBot
b340810615 [MIRROR] Changes archives examine message (#6066)
* Changes archives examine message (#36585)

* Changes archives examine message

* Sure

* Changes archives examine message
2018-03-22 06:10:43 -05:00
CitadelStationBot
bd3d76b8d3 [MIRROR] Modularises vending machines (#6050)
* Modularises vending machines

* Update vending_items.dm
2018-03-22 06:10:17 -05:00
CitadelStationBot
30e5e7a56a [MIRROR] Fixes regression with pulled objects and space transitions (#6065)
* Fixes regression with pulled objects and space transitions (#36587)

* Fixes spesspulling

* honk

* Fixes regression with pulled objects and space transitions
2018-03-22 06:09:55 -05:00
CitadelStationBot
b283c5f07a [MIRROR] fixes "Blob gas tastes of "slime and errors"" (#6064)
* fixes "Blob gas tastes of "slime and errors"" (#36582)

* fix

* bad taste descriptions

* done

* ff

* fixes "Blob gas tastes of "slime and errors""
2018-03-22 06:09:26 -05:00
CitadelStationBot
c8c7e6575b [MIRROR] fixes "Xeno acid melts lava" (#6063)
* fixes "Xeno acid melts lava" (#36584)

* fix

* im dumb

* fixes "Xeno acid melts lava"
2018-03-22 06:08:51 -05:00
CitadelStationBot
78405ddab8 [MIRROR] Adds audio for arcane barrage spell (#6062)
* fix (#36576)

* Adds audio for arcane barrage spell
2018-03-22 06:08:31 -05:00
CitadelStationBot
ad912651c7 [MIRROR] Blood rites fix (#6061)
* Blood rites fix (#36579)

* Blood rites fix
2018-03-22 06:08:05 -05:00
CitadelStationBot
b1e16ee15b [MIRROR] basic buildmode-made walls have a standard floor baseturf (#6060)
* basic buildmode-made walls have a standard floor baseturf (#36578)

* basic buildmode-made walls have a standard floor baseturf

* proper baseturf setting

* basic buildmode-made walls have a standard floor baseturf
2018-03-22 06:07:41 -05:00
CitadelStationBot
1d94d6cbe3 [MIRROR] mobs will stop pulling things on death (#6059)
* mobs will stop pulling things on death (#36581)

* mobs will stop pulling things on death
2018-03-22 06:07:15 -05:00
CitadelStationBot
2c93091caf [MIRROR] fixes "Drinking glass not updating when used in crafting" (#6058)
* fix (#36580)

* fixes "Drinking glass not updating when used in crafting"
2018-03-22 06:06:44 -05:00
CitadelStationBot
738df3f400 [MIRROR] fixes breaking SSUs (#6057)
* fixes breaking SSUs (#36577)

* fixes breaking SSUs
2018-03-22 06:06:21 -05:00
deathride58
476d4ff075 Merge pull request #6053 from Citadel-Station-13/upstream-merge-36539
[MIRROR] Removes toolarm prefix from toolarm surgery tools.
2018-03-21 21:45:09 +00:00
deathride58
def113531c Merge pull request #6052 from Citadel-Station-13/upstream-merge-36565
[MIRROR] Being happy no longer makes you obese.
2018-03-21 21:44:49 +00:00
Tlaltecuhtli
3fab4a3b41 fixes #36538 (#36539)
Removes toolarm prefix from toolarm surgery tools.
2018-03-21 16:14:35 -05:00
CitadelStationBot
848ec04d38 [MIRROR] Sets the default preload_rsc to 2 (#6051)
* Sets the default preload_rsc to 2 (#36556)

This was supposed to be 1 or 2 (2 preloads uploaded resources) in the repo and set to 0 in [`server_side_modifications.dm`](https://tgstation13.org/parsed-logs/basil/server_side_modifications.dm) but i messed that up when i switched it from a test merging pr to something mergable.

* Sets the default preload_rsc to 2
2018-03-21 15:55:47 -05:00
Qustinnus
79911d330a Being happy no longer makes you obese. (#36565)
* D O U B L E N E G A T I V E

* jesus
2018-03-21 15:35:33 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907)
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
2018-03-21 15:28:06 -05:00
deathride58
c14b00ad80 Merge pull request #6033 from Poojawa/bluespace-bags-are-a-mistake
Fixes occupied bluespace bodybags from being put in the analyzer
2018-03-21 19:31:05 +00:00
deathride58
0a331a26ee Merge pull request #5994 from Poojawa/beepboop
Adds IPCs refractors preferences
2018-03-21 19:20:43 +00:00
CitadelStationBot
4403ccf908 [MIRROR] Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#6038)
* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#36549)

* Add Fringe Weaver, Sugar Rush, Crevice Spike from Va-11 Hall-A

* Rebalance crevice spike damage

* Crevice Spike cleanup and sugar-y Sugar Rush

* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A
2018-03-21 14:00:54 -05:00
CitadelStationBot
2fbdfd1856 [MIRROR] Atmos unary devices can now be analyzed (#6037)
* Atmos unary devices can now be analyzed (#36485)

tweak: Unary devices can now be analyzed using gas scanners. This means stuff like vents, scrubbers, cryo tubes, or heaters/freezers.


fixes #36448

this means stuff like cryo, vents, scrubbers, heat exchangers, heaters/freezers, injectors, those big pressure tanks etc. can now be analyzed by gas analyzers/PDA gas scanners

* Atmos unary devices can now be analyzed
2018-03-21 12:58:24 -05:00
CitadelStationBot
99487a6bbb [MIRROR] April Fools Day replaces the overflow role with Clowns (#6041)
* April Fools Day replaces the overflow role with Clowns (#36533)

* Refactors overflow job assignment

* Fixes job selection

* April Fools Day replaces the overflow role with Clowns
2018-03-21 12:57:30 -05:00
CitadelStationBot
4ad2b2975a [MIRROR] Fixes some more trauma bugs (#6039)
* Fixes some more trauma bugs (#36487)

* fixes some more trauma bugs

* Update brain_trauma.dm

* Update brain_item.dm

* Fixes some more trauma bugs
2018-03-21 12:50:22 -05:00