Commit Graph

13039 Commits

Author SHA1 Message Date
Poojawa
467df149fd I swear every player on this server is a complete idiot
God forbid anyone has anything remotely fun.
2018-02-04 08:16:54 -06:00
Poojawa
8c48f46dd0 tump buckets and force the failsafe to trigger 2018-02-04 04:58:43 -06:00
Poojawa
4581364afd mso suggested remedy 2018-02-03 21:57:58 -06:00
Poojawa
bba401a437 might help to ensure it's enabled 2018-02-03 10:53:39 -06:00
Poojawa
40c98ad9ff adds sickshot to the same lockers as defibs 2018-02-03 10:40:42 -06:00
Poojawa
ed72d175c8 actually no, let's just do this 2018-02-03 10:34:42 -06:00
Poojawa
1bc69ec9b2 Vore alterations 2018-02-03 10:28:27 -06:00
Poojawa
7294424397 Makes Stargazers admin only 2018-02-03 09:03:16 -06:00
Poojawa
4f8153ce69 FINALLY FIXES BORG ITEM BLACKLIST AAAAAAAAAAAA 2018-02-03 09:03:03 -06:00
Poojawa
9755eb28ee compile fixes 2018-02-03 06:32:16 -06:00
Poojawa
d0a05393b4 Merge branch 'TG-sync-testing' of https://github.com/Citadel-Station-13/Citadel-Station-13 into TG-sync-testing 2018-02-03 06:24:31 -06:00
Poojawa
059b34050b Removes Stargazers, far too liable to be abused by powergamers 2018-02-03 06:24:27 -06:00
deathride58
ab1c75edbb Temporarily disables autocall 2018-02-02 23:17:31 -05:00
deathride58
09436512b4 Merge branch 'master' into TG-sync-testing 2018-02-03 01:52:44 +00:00
Poojawa
9b976b1c04 fixes missing hands sprites 2018-02-02 17:45:13 -06:00
CitadelStationBot
f02529555c [MIRROR] Fix roundend splash screens (#5242)
* Fix roundend splash screens

* Update screen_objects.dm
2018-02-02 01:22:56 -06:00
Poojawa
5680a33004 If you're having trouble, move the priority check higher 2018-02-01 22:31:42 -06:00
Poojawa
e0703fcecc Removes Fun 2018-02-01 21:39:30 -06:00
Poojawa
dae0a7a808 Merge branch 'TG-sync-testing' of https://github.com/Citadel-Station-13/Citadel-Station-13 into TG-sync-testing 2018-02-01 12:59:06 -06:00
CitadelStationBot
5b2bdf7670 Automatic changelog generation for PR #5251 [ci skip] 2018-02-01 12:58:46 -06:00
deathride58
408e0cce5f Fixes genital previews (#5251) 2018-02-01 12:58:44 -06:00
Poojawa
ea5fff30bf refractors genital overlays to mutable_appearance 2018-02-01 12:54:45 -06:00
Poojawa
ae888f1dff fix problems with one weird trick
if I'm not using something, I shouldn't be using it.
2018-02-01 08:56:01 -06:00
Zna12
5e06583dad What a mess. (#5238)
This should fix the issue of having the minerals and output coming out of the wrong sides of the ORM.
2018-02-01 06:20:43 -08:00
Poojawa
faccc43461 fucking github REEEEEEEEEEE 2018-01-31 18:33:46 -06:00
Poojawa
ebf5366e73 Delta was apparantly a github copy/paste wtf 2018-01-31 18:23:42 -06:00
Poojawa
ab0e0667f2 Makes Travis happy 2018-01-31 18:11:19 -06:00
Poojawa
cf537cd417 Removing abandon map. 2018-01-31 11:18:41 -06:00
Poojawa
01c4b6caf8 ALWAYS KEEP THE REFS UP TO DATE NERDS 2018-01-31 10:22:30 -06:00
Poojawa
2f16174e7c overdue refractor on layering code
also probably fixes missing sprites
2018-01-31 10:13:17 -06:00
Poojawa
aa04e62b29 cult lol xd 2018-01-31 08:07:22 -06:00
Poojawa
4ce8f9ec80 clean up icons folder of unused .dmis 2018-01-31 07:38:58 -06:00
Poojawa
d7f8b8fbe4 dme enabling 2018-01-31 07:17:21 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
LetterJay
18229f81b7 Merge pull request #5221 from Citadel-Station-13/upstream-merge-35170
[MIRROR] Add whiteship dock to space ruin code
2018-01-31 04:14:40 -06:00
CitadelStationBot
e18152dbff Automatic changelog generation for PR #5220 [ci skip] 2018-01-31 04:14:30 -06:00
LetterJay
391e317451 Merge pull request #5220 from Citadel-Station-13/upstream-merge-35113
[MIRROR] Morgue and Crematorium Repositions
2018-01-31 04:14:27 -06:00
CitadelStationBot
26b8590b93 Automatic changelog generation for PR #5218 [ci skip] 2018-01-31 04:13:08 -06:00
LetterJay
37d0ad44cd Merge pull request #5218 from Citadel-Station-13/upstream-merge-35127
[MIRROR] Redone Coffin Icons (Dikembe Mutombo Edition)
2018-01-31 04:13:05 -06:00
CitadelStationBot
07aed08acc Automatic changelog generation for PR #5216 [ci skip] 2018-01-31 04:12:47 -06:00
LetterJay
527e6545e2 Merge pull request #5216 from Citadel-Station-13/upstream-merge-35081
[MIRROR] Potato battery nerf
2018-01-31 04:12:45 -06:00
LetterJay
758a4170c8 Merge pull request #5214 from Citadel-Station-13/upstream-merge-35103
[MIRROR] Adds client version to ingame reporting
2018-01-31 04:12:26 -06:00
CitadelStationBot
12f2fba555 Automatic changelog generation for PR #5213 [ci skip] 2018-01-31 04:12:14 -06:00
LetterJay
903a89e281 Merge pull request #5213 from Citadel-Station-13/upstream-merge-35045
[MIRROR] Turrets now check borgs!
2018-01-31 04:12:11 -06:00
LetterJay
cfcef963ad Merge pull request #5189 from Citadel-Station-13/upstream-merge-35080
[MIRROR] Recompile runtime condenser with compile time optimizations
2018-01-31 04:07:49 -06:00
CitadelStationBot
a2dbeddc45 Automatic changelog generation for PR #5184 [ci skip] 2018-01-31 04:07:40 -06:00
LetterJay
7ac807afa6 Merge pull request #5184 from Citadel-Station-13/upstream-merge-34849
[MIRROR] Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC
2018-01-31 04:07:37 -06:00