shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,025 Commits 5 Branches 0 Tags
f8697faf8f7d40657821a568a9ea147001df6b47
Commit Graph
15025 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000andCitadelStationBot f8697faf8f Fixes wormhole projectors (#36622) 2018-03-26 17:19:46 -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
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
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
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
deathride58andGitHub 59ed76c71f Merge pull request #6087 from GrayRachnid/fix-neko-ears 
Fix neko ears
 2018-03-22 23:31:52 +00:00
GrayRachnidandGitHub a830db5b65 fixes neko ears 2018-03-22 18:58:04 -04:00
GrayRachnidandGitHub a1dd3b3fdb Delete blood_magic.dm 2018-03-22 18:57:01 -04:00
GrayRachnidandGitHub 3410b61ad8 Add files via upload 2018-03-22 18:01:14 -04:00
LetterJay 09cd9189e3 fixes missing shock collar icon 2018-03-22 12:10:08 -05:00
LetterJayandGitHub bc081de775 Merge pull request #6070 from Citadel-Station-13/donatorstuff 
Donator PR, file clean up
 2018-03-22 08:40:56 -05:00
CitadelStationBotandPoojawa 441b8f4314 [MIRROR] Syndie lavaland base: adds turret control panel, soap, chemistry supplies (#6073) 
* Syndie lavaland base: adds turret control panel, soap, chemistry supplies (#36486)

* turret control test
area change, tests v2
test v3 finished
ailock
linebreak
soap
science goggles

* control_area fix, chemistry supplies

* how the hell

* Syndie lavaland base: adds turret control panel, soap, chemistry supplies
 2018-03-22 06:13:07 -05:00
CitadelStationBotandPoojawa e6c74cc0da [MIRROR] Count gorilla transforms (#6072) 
* Count gorilla transforms (#36563)

* Count gorilla transforms
 2018-03-22 06:12:46 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa bd3d76b8d3 [MIRROR] Modularises vending machines (#6050) 
* Modularises vending machines

* Update vending_items.dm
 2018-03-22 06:10:17 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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