shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,856 Commits 5 Branches 0 Tags
b2e176346c33afbefeb744b4e88198d1ea9fe3aa
Commit Graph

67 Commits

Author SHA1 Message Date
ktccd
c52f7a0475 Delayed objective (#2140) 
Delayed objective [Latejoiners can now be selected as traitor targets]
 2017-07-27 05:27:58 -07:00
CitadelStationBot
b025182955 Possibly fix player_list sometimes having a null (#2022) 2017-07-15 11:45:33 -07:00
CitadelStationBot
1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05: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
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
21878a77f0 Fixes heartbeat sounds playing indefinitely in certain cases 2017-07-06 08:26:23 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
fce1875d73 Observers can see through some alternate apperances (#1829) 2017-06-30 20:47:57 -07:00
CitadelStationBot
a9a2a29dd4 Fix the lobby menu not showing when the mysql connection had ghosted (#1839) 2017-06-30 20:47:36 -07:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
LetterJay
be70bbbd5c Merge pull request #1597 from Citadel-Station-13/GulimonsRus 
Adds guilmon as a race (via Muffin)
 2017-06-14 11:47:09 -05:00
LetterJay
67770a25be final commit(?) 2017-06-14 09:54:14 -05:00
LetterJay
28d726d1af Still need to fix the head. 2017-06-14 04:54:28 -05:00
LetterJay
276bb8b786 Merge pull request #1483 from Citadel-Station-13/upstream-merge-28185 
[MIRROR] Fixes ghosts not returning an initialize hint
 2017-06-12 12:44:10 -05:00
CitadelStationBot
ea05bdbc26 Makes arrivals shuttle slightly more juicy 2017-06-11 17:28:44 -05:00
CitadelStationBot
180f0e82c8 Fixes ghosts not returning an initialize hint 2017-06-08 09:45:52 -05:00
CitadelStationBot
c5143880d2 Fixes logged out spawning new_players 2017-06-06 13:28:23 -05:00
CitadelStationBot
e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
CitadelStationBot
1937fc5294 Fixes delayed login message 2017-05-26 23:53:21 -05:00
CitadelStationBot
6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
CitadelStationBot
4f971be3a9 [MIRROR] Golems do not have underclothing (#784) 
* Golems do not have underclothing

* Resolves .rej

* Update golems.dm

* Update golems.dm
 2017-05-18 03:53:14 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
LetterJay
1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
46f5c4bb1b commit 2017-05-16 23:35:54 -05:00
LetterJay
3d0a1b2573 commit 2017-05-14 00:05:53 -05:00
LetterJay
a9e0b28872 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26908 2017-05-14 00:04:52 -05:00
CitadelStationBot
afdf829abc [MIRROR] Visible ghosts emit light (#877) 
* Visible ghosts emit light

* Update ghost.dm

* Delete ghost.dm.rej
 2017-05-10 16:16:23 -07:00
CitadelStationBot
c782e15d64 [MIRROR] Fix server hop (#740) 
* Fix server hop

* Delete new_player.dm.rej
 2017-05-08 16:47:21 -07:00
LetterJay
2efe90055f Revert "[MIRROR] Fixes say verbs not working" 2017-05-07 19:41:33 -04:00
CitadelStationBot
877acc972a Fixes dead mobs being initialized twice 2017-05-05 18:12:07 -05:00
CitadelStationBot
56d5e12263 Moves languages to a holder datum, gives mind its own language holder 2017-05-05 08:13:04 -05:00
CitadelStationBot
f7d45f3010 Fixes say verbs not working 2017-05-04 18:41:04 -05:00
LetterJay
4ecbec1406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720 2017-05-02 11:36:27 -05:00
LetterJay
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
LetterJay
2d9a497f31 Merge pull request #609 from Citadel-Station-13/upstream-merge-26625 
[MIRROR] Server hop can now be used in lobby
 2017-05-01 07:39:35 -05:00
CitadelStationBot
7a4f1496e9 Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted 2017-05-01 07:24:45 -05:00
LetterJay
a39b40d879 Merge pull request #578 from Citadel-Station-13/upstream-merge-25981 
[MIRROR] Initialize Refactor
 2017-04-28 09:29:00 -05:00
LetterJay
085b421348 rej fixes 2017-04-28 09:03:56 -05:00
CitadelStationBot
a0c1f979dc Fixes templates/ruins not updating area list 2017-04-27 17:02:33 -05:00
CitadelStationBot
82ecda1353 Server hop can now be used in lobby 2017-04-27 16:40:53 -05:00
CitadelStationBot
08a01aa11b Refactors roundstart checks slightly 2017-04-26 17:06:29 -05:00
CitadelStationBot
cea81a3357 Initialize Refactor 2017-04-26 16:03:17 -05:00
CitadelStationBot
c5eeb2de67 Revert "Ghosts call Moved() after Move() (#26183)" (#510) 2017-04-26 10:11:47 -05:00
CitadelStationBot
a905c15dad Replaces /image with /mutable_appearance (#556) 
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
 2017-04-26 08:18:35 -05:00
LetterJay
de1d8188ae removes rej files 2017-04-24 21:34:58 -05:00
CitadelStationBot
ffc35f33ba Ghosts no longer drift in space 2017-04-24 17:53:49 -05:00
CitadelStationBot
1a93abc66e Conveyor movement refactor/fix 2017-04-21 17:28:09 -05:00