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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,969 Commits 55 Branches 0 Tags
d6fdd618e8467a1181fb06200f15a7fbe0e2cd94
Commit Graph

273 Commits

Author SHA1 Message Date
CitadelStationBot
d6fdd618e8 Removes spaces to underline from add_details 2017-08-01 08:46:27 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot
986549df26 Fixes global init linux bug by using proc typepath references, adds better error detection (#2137) 2017-07-26 00:05:10 -07:00
CitadelStationBot
556699d562 Fixes timer id collision (#2136) 2017-07-26 00:04:47 -07:00
CitadelStationBot
ba0c60a697 Adds logging of shuttle request reasons. 2017-07-25 09:53:46 -05:00
CitadelStationBot
64966027e7 fixes hub not working ree (#2112) 2017-07-24 04:05:44 -07:00
CitadelStationBot
bfcb068f21 Adds proper containers for some locates (#2080) 2017-07-20 06:31:25 -07:00
LetterJay
7b15a20022 Merge pull request #2038 from Citadel-Station-13/upstream-merge-29178 
[MIRROR] Ports /vg/'s datum component system
 2017-07-19 13:41:00 -05:00
CitadelStationBot
e6d6478482 Small belt overlay rewrite, and tool overlays for toolbelts 2017-07-19 09:30:06 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot
956f10f2d2 [s]Fixes panic bunker 2017-07-17 07:13:45 -05:00
CitadelStationBot
37ac7ee292 Ports /vg/'s datum component system 2017-07-16 19:10:44 -05:00
kevinz000
44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot
f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905) 
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
 2017-07-13 06:37:51 -07:00
CitadelStationBot
fcf09e06e0 Allows admins to set messages when they delay the round end (#1965) 2017-07-10 16:13:51 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
2e4624ee3f Make timer debug info more robust (#1942) 2017-07-07 23:49:10 -07:00
TalkingCactus
cb5247d060 Fixes Gamemode Voting & Map Edits (#1937) 
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
 2017-07-07 17:54:53 -04:00
CitadelStationBot
bf14c1dd61 Machine subsystem now checks qdel status (#1922) 2017-07-07 04:46:36 -07:00
CitadelStationBot
0eb8d9549a Speeds up SSoverlays 2017-07-06 19:21:40 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
bb34fa8c8a Speeds up SSoverlays 2017-07-01 13:55:20 -05:00
CitadelStationBot
259d773cec Round ID is now sent to IRC (#1706) 2017-06-30 21:16:44 -07:00
CitadelStationBot
ca2d03a082 Moves transit space to separate z level. (#1696) 2017-06-30 20:56:45 -07:00
Poojawa
789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
LetterJay
028752c3de Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564 
[MIRROR] Shuttle engines affecting travel time
 2017-06-26 09:00:54 -05:00
LetterJay
165e684e9b Update shuttle.dm 2017-06-26 08:01:38 -05:00
LetterJay
61a8d76122 Update shuttle.dm 2017-06-26 06:36:09 -05:00
LetterJay
e3b1838e63 Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600 
[MIRROR] Adds a heavily-damaged ripley as a lavaland ruin
 2017-06-26 06:24:31 -05:00
CitadelStationBot
1a38b6fd6f Shuttle engines affecting travel time 2017-06-25 20:53:00 -05:00
CitadelStationBot
8375a2dcf9 Fixes an error message 2017-06-22 11:03:29 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot
50a4f61663 Adds a heavily-damaged ripley as a lavaland ruin 2017-06-20 12:09:15 -05:00
LetterJay
e1d6c5d278 increases round time 2017-06-17 22:47:32 -05:00
LetterJay
9842b19282 3 hour rounds 2017-06-17 22:44:42 -05:00
LetterJay
5117b3ea88 Merge pull request #1458 from Citadel-Station-13/upstream-merge-28146 
[MIRROR] Makes processing subsystems respect qdel and PROCESS_KILL
 2017-06-14 08:54:17 -05:00
LetterJay
760dfedeb1 Merge pull request #1530 from Citadel-Station-13/upstream-merge-28250 
[MIRROR] Renames Air subsystem to Atmospherics
 2017-06-12 12:40:37 -05:00
LetterJay
d0c1ecc484 Merge pull request #1511 from Citadel-Station-13/upstream-merge-28237 
[MIRROR] Fixes death report giving the wrong damage type
 2017-06-12 12:32:29 -05:00
CitadelStationBot
8aae860c84 Renames Air subsystem to Atmospherics 2017-06-10 19:11:24 -05:00
LetterJay
47687a6d1a cleanup 2017-06-10 09:42:08 -05:00
LetterJay
eac4854adf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165 2017-06-10 09:38:21 -05:00
LetterJay
79794685c3 Merge branch 'master' into upstream-merge-27890 2017-06-10 08:02:27 -05:00
CitadelStationBot
9a8778b16f Adds /image/proc/copy_overlays 2017-06-09 20:11:51 -05:00
CitadelStationBot
19a1d3555c Fixes death report giving the wrong damage type 2017-06-09 20:06:36 -05:00
CitadelStationBot
9e0488d2d9 Moves borer completion to gamemode 2017-06-09 09:01:03 -05:00
CitadelStationBot
1bdda132e7 Adds Medal Commendations! 2017-06-08 20:39:15 -05:00
CitadelStationBot
7eedaa87c5 Moves station's starting state to ticker post setup, instead of gamemode's 2017-06-07 20:54:37 -05:00