shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,080 Commits 5 Branches 0 Tags
cb4aa936dbb0fa0c6cd2c35716e9564b60bb2c4d
Commit Graph

5602 Commits

Author SHA1 Message Date
LetterJay
cb4aa936db Update ai.dm 2018-03-29 18:32:24 -07:00
LetterJay
002c5a2b73 ai icon 2018-03-29 18:32:24 -07:00
kevinz000
dc4b52bcfd logging (#36818) 2018-03-29 18:31:31 -07:00
CitadelStationBot
de282f5201 [MIRROR] individual player panel now logs 100% of the time (#6176) 
* individual player panel now logs 100% of the time

* logging (#36819)
 2018-03-29 17:10:37 -07: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
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
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
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
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
Ashe Higgs
0f39d85a80 Fixes slimeperson traits (#36663) 2018-03-26 21:12:07 -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
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
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
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
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
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
d4738d4676 [MIRROR] Fixes air alarm values (#6103) 
* air alarm values (#36629)

* Fixes air alarm values
 2018-03-26 04:29:12 -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
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
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
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
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
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
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
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
Tlaltecuhtli
3fab4a3b41 fixes #36538 (#36539) 
Removes toolarm prefix from toolarm surgery tools.
 2018-03-21 16:14:35 -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