cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-13 11:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,055 Commits 55 Branches 0 Tags
be9ae841b6eb4379542f3c0f8440e5baf7b4b51c
Commit Graph

9510 Commits

Author SHA1 Message Date
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
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
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