Commit Graph

9523 Commits

Author SHA1 Message Date
Alomga 6b48740f7e Tweaks stats of 4 virus symptoms (#36748)
Makes Vitiligo, Revitiligo, Facial Hypertrichosis and Alopecia usefull instead of making your virus worse without contributing anything. Symptom that makes you pale shouldn't have worse stats that one that can kill.
2018-03-28 19:21:05 -05:00
deathride58 d351caf92f Merge pull request #6130 from Citadel-Station-13/upstream-merge-36663
[MIRROR] Slimepeople now transfer traits on body-swap, and traits now transfer correctly
2018-03-27 17:51:35 +00:00
deathride58 e6c16ba8f8 Merge pull request #6129 from Citadel-Station-13/upstream-merge-36597
[MIRROR] Security records consoles now uploads the center 32x32 of a photo when putting photos in
2018-03-27 17:51:17 +00:00
deathride58 c3328968a1 Merge pull request #6128 from Citadel-Station-13/upstream-merge-36622
[MIRROR] Fixes wormhole projectors
2018-03-27 17:51:00 +00:00
deathride58 6bbe0d4150 Merge pull request #6126 from Citadel-Station-13/upstream-merge-36715
[MIRROR] Replaces sniper bullets ex_act with bonus obj damage
2018-03-27 17:49:53 +00:00
deathride58 aa415031a0 Merge pull request #6125 from Citadel-Station-13/upstream-merge-36671
[MIRROR] Fixes machines not updating power when changing areas
2018-03-27 17:49:35 +00:00
deathride58 c5d3bb3986 Merge pull request #6124 from Citadel-Station-13/upstream-merge-36720
[MIRROR] Adds sanity check so you don't accidentally pop a fun balloon multiple times
2018-03-27 17:49:13 +00:00
deathride58 be9ae841b6 Merge pull request #6123 from Citadel-Station-13/upstream-merge-36716
[MIRROR] Adds singular_name to BS crystals
2018-03-27 17:48:51 +00:00
deathride58 952fd00ff4 Merge pull request #6122 from Citadel-Station-13/upstream-merge-36712
[MIRROR] Fixes pacifists being able to attack animals
2018-03-27 17:48:31 +00:00
deathride58 f8acaf35a8 Merge pull request #6121 from Citadel-Station-13/upstream-merge-36708
[MIRROR] removes unnecessary message
2018-03-27 17:48:07 +00:00
deathride58 3a31833a8f Merge pull request #6120 from Citadel-Station-13/upstream-merge-36710
[MIRROR] Properly Blacklists Mushroom People
2018-03-27 17:47:42 +00:00
deathride58 ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398
[MIRROR] [READY]pathfinding circuitry upgrade
2018-03-27 17:47:11 +00:00
deathride58 87600c4ff4 Merge pull request #6118 from Citadel-Station-13/upstream-merge-36509
[MIRROR] [READY]recycler buff
2018-03-27 17:46:23 +00:00
deathride58 34d0d456ff Merge pull request #6117 from Citadel-Station-13/upstream-merge-36697
[MIRROR] Fixes wet floor scaling
2018-03-27 17:45:59 +00:00
deathride58 85a621f717 Merge pull request #6113 from Citadel-Station-13/upstream-merge-36695
[MIRROR] Fixes consoles
2018-03-27 17:45:35 +00:00
deathride58 15472805ba Merge pull request #6055 from Poojawa/cmo-hypo-objective
Removes the old hypospray from CMO closet, updates tator objective
2018-03-27 17:41:44 +00:00
Ashe Higgs 0f39d85a80 Fixes slimeperson traits (#36663) 2018-03-26 21:12:07 -05:00
kevinz000 40776d5ee5 Security records consoles now uploads the center 32x32 of a photo when putting photos in (#36597)
* Sec console centering photos

* Update security.dm

* whoever coded this before me is triple meme
2018-03-26 21:04:48 -05:00
kevinz000 f8697faf8f Fixes wormhole projectors (#36622) 2018-03-26 17:19:46 -05:00
XDTM 3d36b34650 Replaces sniper bullets ex_act with bonus obj damage (#36715)
* Replaces sniper bullets ex_act with bonus obj damage

* Update sniper.dm

* Update sniper.dm
2018-03-26 17:17:23 -05:00
Jordan Brown ed6fae603e Merge pull request #36671 from YPOQ/areachangepowerfix
Fixes machines not updating power when changing areas
2018-03-26 14:25:06 -05:00
Dax Dupont 46976c4cab Adds sanity check so you don't accidentally pop a fun balloon multiple times (#36720)
* Adds sanity check so you don't accidentally pop a fun balloon multiple times.

* Fuck it, probably better like this

* heck
2018-03-26 14:22:53 -05:00
Jordan Brown 35f0fe9676 Merge pull request #36716 from 81Denton/bscrystalname
Adds singular_name to BS crystals
2018-03-26 14:21:36 -05:00
Jordan Brown 08569ff906 Merge pull request #36712 from XDTM/NoPunchingIan
Fixes pacifists being able to attack animals
2018-03-26 14:19:23 -05:00
Jordan Brown d6a5f2c831 Merge pull request #36708 from Armhulen/patch-66
removes unnecessary message
2018-03-26 14:18:12 -05:00
Jordan Brown 98b308279f Merge pull request #36710 from fludd12/Inky-Capped-Lists
Properly Blacklists Mushroom People
2018-03-26 14:18:03 -05:00
arsserpentarium 303272319a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 11:01:22 -05:00
arsserpentarium febcc648af [READY]recycler buff (#36509)
* recycler

* runtimemitnur

* mkay
2018-03-26 10:54:04 -05:00
kevinz000 4773743eab Fixes wet floor scaling (#36697)
* Fixes wet floor scaling

* Meh lets not
2018-03-26 10:49:42 -05:00
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
Poojawa 34718e35cd Update medical.dm 2018-03-26 04:32:36 -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
oranges 3a93b7e75a Fixes consoles 2018-03-26 02:30:18 -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