shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,358 Commits 5 Branches 0 Tags
2f2c8509376af49d4d1d73fe04161f4f597a7f68
Commit Graph

80 Commits

Author SHA1 Message Date
kevinz000 a1cb1d456d Merge pull request #800 from Citadel-Station-13/upstream-merge-26934 
[MIRROR] Seed vault lavaland ruin can only spawn once
 2017-05-06 21:24:46 -07:00
CitadelStationBot 2922a9fee8 Seed vault lavaland ruin can only spawn once 2017-05-06 08:09:25 -05:00
CitadelStationBot 684c4a5244 Fixes answering a holocall not disconnecting other calls 2017-05-05 10:28:26 -05:00
LetterJay 1bb43eb7ae woo 2017-05-05 10:21:53 -05:00
LetterJay caaf0fc2ee Merge pull request #698 from Citadel-Station-13/upstream-merge-25743 
[MIRROR] Holocalls
 2017-05-05 10:19:28 -05:00
LetterJay 5d0f7eafaa Merge pull request #719 from Citadel-Station-13/upstream-merge-26771 
[MIRROR] Removes vestigial list from minds.
 2017-05-05 09:40:28 -05:00
LetterJay f333944be0 le fix 2017-05-03 09:02:19 -05:00
CitadelStationBot 6a365857d1 Should fix all of the cult/clockcult issues 2017-05-02 20:44:34 -05:00
LetterJay 368a2e82c1 Merge pull request #709 from Citadel-Station-13/upstream-merge-26762 
[MIRROR] Fixes cult datum giving the action button to the mind instead of mob
 2017-05-02 18:47:55 -05:00
LetterJay 84db006ea9 Merge pull request #711 from Citadel-Station-13/upstream-merge-26799 
[MIRROR] Fixes cult and clockcult icons
 2017-05-02 18:46:38 -05:00
CitadelStationBot 7baccb8b85 Removes vestigial list from minds. 2017-05-02 12:47:20 -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 3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
LetterJay a8e6de5795 manual merge 2017-05-02 05:06:13 -05:00
CitadelStationBot 22f6aecdf7 Fixes cult and clockcult icons 2017-05-01 21:03:40 -05:00
CitadelStationBot 3fff6d4a1d Fixes cult datum giving the action button to the mind instead of mob 2017-05-01 20:27:03 -05:00
CitadelStationBot 36dfc5a4db Holocalls 2017-05-01 12:53:40 -05:00
CitadelStationBot 1426a20834 Gaining Vanguard will remove existing stuns 2017-05-01 11:07:33 -05:00
LetterJay 3d6845675a Merge pull request #679 from Citadel-Station-13/upstream-merge-26709 
[MIRROR] Readds deepstorage w/ tweaks AND adds water bottles to vending machines
 2017-05-01 08:10:13 -05:00
LetterJay 7261d61983 Merge pull request #672 from Citadel-Station-13/upstream-merge-26717 
[MIRROR] Moves antag datums to the mind
 2017-05-01 08:09:22 -05:00
LetterJay 061e49d651 Merge pull request #654 from Citadel-Station-13/upstream-merge-26662 
[MIRROR] Status effects are actually deleted/handled when the mob is deleted
 2017-05-01 07:59:55 -05:00
CitadelStationBot 7a4f1496e9 Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted 2017-05-01 07:24:45 -05:00
CitadelStationBot 87e306851d Readds deepstorage w/ tweaks AND adds water bottles to vending machines 2017-05-01 07:24:41 -05:00
CitadelStationBot 9be1a5db4f Moves antag datums to the mind 2017-04-30 14:32:15 -05:00
CitadelStationBot fccbe18286 Status effects are actually deleted/handled when the mob is deleted 2017-04-29 16:50:50 -05:00
LetterJay 06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
CitadelStationBot 4da7414339 Old ore processor cleanup 2017-04-29 03:46:03 -05:00
lm40 67300fc3b2 Update emotes.dm 2017-04-28 20:17:21 -04:00
LetterJay f7fa4d9843 Merge pull request #615 from Citadel-Station-13/upstream-merge-26187 
[MIRROR] Adds a delete verb to the vv_drop_down
 2017-04-28 08:18:07 -05:00
CitadelStationBot caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot df4f3aaaad Adds a delete verb to the vv_drop_down 2017-04-27 17:10:44 -05:00
CitadelStationBot bba83f9291 Lowers max list size in vv 2017-04-26 20:15:54 -05:00
CitadelStationBot 08a01aa11b Refactors roundstart checks slightly 2017-04-26 17:06:29 -05:00
CitadelStationBot bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBot 3d2f91d0c7 Removes a lavaland_surface_ww_vault.dmm because its just bad. (#536) 2017-04-26 11:08:30 -05:00
Poojawa 8ec4cbbb9f Fixes carelessness. (#577) 
* Update hud.dm

* Delete hud.dm.rej

* Update alternate_appearance.dm

* Delete alternate_appearance.dm.rej

* Delete mob.dm.rej

* Update mob.dm
 2017-04-26 10:37:57 -05:00
CitadelStationBot 4cf23d086a Fixed nulls in the active_alternate_appearances list (#568) 2017-04-26 10:11:22 -05:00
CitadelStationBot 84321916a5 Refactors ears into organs (#513) 
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
 2017-04-26 09:52:35 -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 73456c9e9a REJECT CLEANUP. FUUUUUUUUUUUUUUUUUUCK. 2017-04-25 21:40:46 -05:00
LetterJay 6dc70fc02f Merge pull request #526 from Citadel-Station-13/upstream-merge-26289 
[MIRROR] Changed alternate appearances to  /datum/atom_hud s
 2017-04-25 21:39:14 -05:00
CitadelStationBot fb61c31470 Small abductors refactor 2017-04-25 03:59:08 -05:00
LetterJay 3d51a07243 world fix 2017-04-25 01:52:49 -05:00
CitadelStationBot 607868a5de [s]Exploit whack-a-mole 2017-04-25 01:31:50 -05:00
CitadelStationBot defa9d863c >We still let old code in the codebase 2017-04-24 21:22:11 -05:00
CitadelStationBot 387caa518f Changed alternate appearances to /datum/atom_hud s 2017-04-23 13:26:08 -05:00
Poojawa f866139c52 Admin ticket tgstyle (#493) 
* some porting

* other changes
 2017-04-20 22:00:47 -05:00
CitadelStationBot 02b1e41ec3 Fixes action transfer 2017-04-19 14:07:49 -05:00
CitadelStationBot fe57757fd7 Adds a proc to check if the current thread is from an admin advanced proc call (#400) 2017-04-15 14:41:36 -04:00