shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,043 Commits 5 Branches 0 Tags
ebc51d94bfcc0e458b23acd2acdfe425bd989937
Commit Graph
15043 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 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
deathride58andGitHub 87600c4ff4 Merge pull request #6118 from Citadel-Station-13/upstream-merge-36509 
[MIRROR] [READY]recycler buff
 2018-03-27 17:46:23 +00:00
deathride58andGitHub 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
deathride58andGitHub 85a621f717 Merge pull request #6113 from Citadel-Station-13/upstream-merge-36695 
[MIRROR] Fixes consoles
 2018-03-27 17:45:35 +00:00
deathride58andGitHub 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
LetterJayandGitHub 0baeeb548d Merge pull request #6094 from Citadel-Station-13/kevinz000-patch-1 
Increases arousal performance, bandaid patch
 2018-03-26 22:39:11 -05:00
CitadelStationBot ff6b7866bb [READY]pathfinding circuitry upgrade 2018-03-26 11:01:23 -05:00
arsserpentariumandCitadelStationBot 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
CitadelStationBot fc978692f5 [READY]recycler buff 2018-03-26 10:54:04 -05:00
arsserpentariumandCitadelStationBot febcc648af [READY]recycler buff (#36509) 
* recycler

* runtimemitnur

* mkay
 2018-03-26 10:54:04 -05:00
CitadelStationBot cd62983c23 Fixes wet floor scaling 2018-03-26 10:49:42 -05:00
kevinz000andCitadelStationBot 4773743eab Fixes wet floor scaling (#36697) 
* Fixes wet floor scaling

* Meh lets not
 2018-03-26 10:49:42 -05:00
PoojawaandGitHub 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
CitadelStationBotandPoojawa 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
Nightspark43andPoojawa 399c2745bd Glass of Sake icon fix (#6089) 
🆑
fix: fixes the glass of sake icon not appearing
/🆑
 2018-03-26 04:35:55 -05:00
CitadelStationBotandPoojawa 1c5081af32 [MIRROR] Logs abductor chat (#6114) 
* Logs abductor chat (#36713)

* Logs abductor chat
 2018-03-26 04:33:28 -05:00
PoojawaandGitHub 34718e35cd Update medical.dm 2018-03-26 04:32:36 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa bcc360d0d9 [MIRROR] Fixes omega detective office + prepare_maps change (#6110) 
* Fixes omega detective office + prepare_maps change (#36691)

* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge

* Fixes omega detective office + prepare_maps change
 2018-03-26 04:31:41 -05:00
CitadelStationBotandPoojawa 9892fabe4e [MIRROR] Restores empty state to 96x96.dmi (#6109) 
* Restores empty state to 96x96

* Restores empty state to 96x96.dmi
 2018-03-26 04:31:17 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 29a4af95c2 [MIRROR] Fixes imaginary friend trauma (#6104) 
* Fixes imaginary friend trauma (#36647)

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

* Fixes air alarm values
 2018-03-26 04:29:12 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
orangesandCitadelStationBot 3a93b7e75a Fixes consoles 2018-03-26 02:30:18 -05:00
CitadelStationBotandkevinz000 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
LetterJay 54432ac723 cloak icon update 2018-03-25 03:10:29 -05:00
Poojawaandkevinz000 77872a1526 makes IPCs bleed oil (#6054) 2018-03-24 12:35:17 -07:00
Ziiroandkevinz000 b70381c89e Adds IPC Antennas (#6049) 2018-03-24 12:33:19 -07:00
GrayRachnidandkevinz000 04a761838d Makes blood cult combat rework compatible. (#6085) 
* Update blood_magic.dm

* Add files via upload

* Update blood_magic.dm

* Update blood_magic.dm

* Update tgstation.dme

* oops i used the wrong backslash
 2018-03-24 12:32:39 -07:00
kevinz000andGitHub 2cd98340de typed 2018-03-24 06:08:58 -07:00
kevinz000andGitHub c73d2763e5 Update arousal.dm 2018-03-24 05:52:08 -07:00
kevinz000andGitHub bef056c034 why did we have that there 2018-03-24 05:39:35 -07:00
kevinz000andGitHub 037d800e34 performant arousal 2018-03-24 05:37:49 -07:00
LetterJayandGitHub c84f85a874 Merge pull request #6091 from Citadel-Station-13/hotfix 
Donator hotfix
 2018-03-23 12:34:28 -05:00
LetterJayandGitHub cdf0ba3def Oops 2018-03-23 12:18:48 -05:00
deathride58andGitHub a23517c5f9 Merge pull request #6076 from Citadel-Station-13/shockicon 
fixes missing shock collar icon
 2018-03-23 16:07:08 +00:00
LetterJay 41c6c4aa4b wrong location 2018-03-22 22:23:42 -05:00
CitadelStationBotandPoojawa 92c868a829 [MIRROR] Prevents overriding shuttle areas (#6081) 
* Prevents overriding shuttle areas

* Prevents overriding shuttle areas
 2018-03-22 19:33:43 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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