Commit Graph
11728 Commits
Author SHA1 Message Date
deathride58 5fd8606a3f migrates donor items to loadout system, comments out handle_roundstart_items, plus fixes 2018-01-17 17:19:54 -05:00
deathride58 b74518a24a adds more loadout equipment, adds working ckey whitelist system, and more 2018-01-16 16:23:22 -05:00
deathride58 b55a497ffc IT WORKS! its testmergable, just gotta add in a ckey whitelist system and add casual friday, then its good 2018-01-15 01:02:35 -05:00
deathride58 036dc82e12 initial commit - initial pref edits and file copypasting from hippie 2018-01-13 15:45:08 -05:00
deathride58andGitHub 5bb87e6778 Merge pull request #4790 from Citadel-Station-13/upstream-merge-34361
[MIRROR] Fix the batch file method of mapmerge2 and save a .before
2018-01-12 17:48:36 +00:00
deathride58andGitHub 391fc06f01 Merge pull request #4789 from Citadel-Station-13/upstream-merge-34301
[MIRROR] Harvesters now normally attack those with NODISMEMBER species
2018-01-12 17:48:24 +00:00
CitadelStationBot 8686d2af17 Automatic changelog generation for PR #4788 [ci skip] 2018-01-12 11:48:16 -06:00
deathride58andGitHub 62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310
[MIRROR] Removes some hrefs from logging
2018-01-12 17:48:13 +00:00
deathride58andGitHub bbc1e0d386 Merge pull request #4787 from Citadel-Station-13/upstream-merge-34305
[MIRROR] Add JMP buttons to mapping debug verbs
2018-01-12 17:47:54 +00:00
CitadelStationBot 732c16cae5 Automatic changelog generation for PR #4786 [ci skip] 2018-01-12 11:47:42 -06:00
deathride58andGitHub 8fdfa44505 Merge pull request #4786 from Citadel-Station-13/upstream-merge-34312
[MIRROR] Fix description of relabelled canisters
2018-01-12 17:47:40 +00:00
CitadelStationBot 903da0a79a Automatic changelog generation for PR #4785 [ci skip] 2018-01-12 11:47:10 -06:00
deathride58andGitHub 64c307800d Merge pull request #4785 from Citadel-Station-13/upstream-merge-34184
[MIRROR] Fixes pet collars not updating icons, also fixes being unable to attach collars to most pets
2018-01-12 17:47:07 +00:00
CitadelStationBot cbd6163210 Automatic changelog generation for PR #4784 [ci skip] 2018-01-12 11:46:48 -06:00
deathride58andGitHub f90a0e66e0 Merge pull request #4784 from Citadel-Station-13/upstream-merge-34174
[MIRROR] Sigils of submission now uncuff upon successful conversion
2018-01-12 17:46:46 +00:00
CitadelStationBot 061c6f2207 Automatic changelog generation for PR #4783 [ci skip] 2018-01-12 11:46:32 -06:00
deathride58andGitHub 0ec41c02d4 Merge pull request #4783 from Citadel-Station-13/upstream-merge-34259
[MIRROR] Pointing will now properly reflect a lack of arms (and legs!)
2018-01-12 17:46:29 +00:00
CitadelStationBot d1f7df200b Automatic changelog generation for PR #4782 [ci skip] 2018-01-12 11:46:03 -06:00
deathride58andGitHub 63354404e4 Merge pull request #4782 from Citadel-Station-13/upstream-merge-34260
[MIRROR] Adds an indestructible disco/dance machine for admemes and disco inferno shuttle
2018-01-12 17:46:00 +00:00
CitadelStationBot c2cb0ed436 Automatic changelog generation for PR #4781 [ci skip] 2018-01-12 11:45:16 -06:00
deathride58andGitHub 160955eef1 Merge pull request #4781 from Citadel-Station-13/upstream-merge-34274
[MIRROR] Makes bot emagging more consistent
2018-01-12 17:45:14 +00:00
deathride58andGitHub 78c5e62ae7 Merge pull request #4780 from Citadel-Station-13/upstream-merge-34280
[MIRROR] Fixes mobs on lavaland targeting through walls on wakeup
2018-01-12 17:44:58 +00:00
CitadelStationBot 927853512d Automatic changelog generation for PR #4779 [ci skip] 2018-01-12 11:44:30 -06:00
deathride58andGitHub 9b2406cf50 Merge pull request #4779 from Citadel-Station-13/upstream-merge-34287
[MIRROR] Makes cyborg module damage visible to anyone nearby
2018-01-12 17:44:27 +00:00
deathride58andGitHub 40d2a8ed55 Merge pull request #4778 from Citadel-Station-13/upstream-merge-34288
[MIRROR] Move a definition to the right file
2018-01-12 17:43:55 +00:00
deathride58andGitHub 661cf56031 Merge pull request #4777 from Citadel-Station-13/upstream-merge-34294
[MIRROR] Add /datum prefix to custom root types
2018-01-12 17:43:38 +00:00
deathride58andGitHub ff6b45e57b Merge pull request #4776 from Citadel-Station-13/upstream-merge-34293
[MIRROR] Fix pixel offsets of east-facing unary atmospherics in DreamMaker
2018-01-12 17:43:17 +00:00
CitadelStationBot 4d67f2966b Automatic changelog generation for PR #4775 [ci skip] 2018-01-12 11:42:59 -06:00
deathride58andGitHub 30bec7a1d0 Merge pull request #4775 from Citadel-Station-13/upstream-merge-34295
[MIRROR] Fixes brass skewer grammar
2018-01-12 17:42:56 +00:00
deathride58andGitHub 8bfc56981b Merge pull request #4774 from Citadel-Station-13/upstream-merge-34297
[MIRROR] Clockcult ark now teleports anything people are in to the station instead of just the person on destruction
2018-01-12 17:42:39 +00:00
deathride58andGitHub a7ec44bfcc Merge pull request #4773 from Citadel-Station-13/upstream-merge-34298
[MIRROR] Adds logging and feedback messages to organ manipulations by admins
2018-01-12 17:42:24 +00:00
deathride58andGitHub ed3779feff Merge pull request #4772 from Citadel-Station-13/upstream-merge-34336
[MIRROR] Fixes forensics runtimes
2018-01-12 17:42:05 +00:00
CitadelStationBot e4a3f2fe1a Automatic changelog generation for PR #4765 [ci skip] 2018-01-12 11:41:47 -06:00
deathride58andGitHub a2fb8b5304 Merge pull request #4765 from Citadel-Station-13/upstream-merge-34117
[MIRROR] Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
2018-01-12 17:41:44 +00:00
CitadelStationBot 5c8f1f7f5b Automatic changelog generation for PR #4764 [ci skip] 2018-01-12 11:41:32 -06:00
deathride58andGitHub 0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090
[MIRROR] Replace hardcoded z-level numbers with a trait system
2018-01-12 17:41:28 +00:00
CitadelStationBot f323ded1f7 Fix the batch file method of mapmerge2 and save a .before 2018-01-12 09:44:00 -06:00
Tad HardestyandCitadelStationBot 12da7d5dec Fix the batch file method of mapmerge2 and save a .before (#34361) 2018-01-12 09:44:00 -06:00
CitadelStationBot 3e2affbec2 Harvesters now normally attack those with NODISMEMBER species 2018-01-12 07:05:49 -06:00
LeoandCitadelStationBot 429237d06c Merge pull request #34301 from kevinz000/patch-428
Harvesters now normally attack those with NODISMEMBER species
2018-01-12 07:05:49 -06:00
CitadelStationBot 24b5a653a8 Removes some hrefs from logging 2018-01-12 07:04:39 -06:00
JJRcopandCitadelStationBot ed6ec3d63a Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
CitadelStationBot 584b8b9848 Add JMP buttons to mapping debug verbs 2018-01-12 07:04:31 -06:00
LeoandCitadelStationBot ab76f05a1e Merge pull request #34305 from AutomaticFrenzy/patch/debug-mapping
Add JMP buttons to mapping debug verbs
2018-01-12 07:04:31 -06:00
CitadelStationBot 4a7173f9a2 Fix description of relabelled canisters 2018-01-12 07:03:20 -06:00
LeoandCitadelStationBot e11e4b3385 Merge pull request #34312 from AutomaticFrenzy/patch/canister-grammar
Fix description of relabelled canisters
2018-01-12 07:03:20 -06:00
CitadelStationBot 7bdcb5fa33 Fixes pet collars not updating icons, also fixes being unable to attach collars to most pets 2018-01-12 06:17:05 -06:00
ShizCalevandCitadelStationBot 8bd1f07353 Fixes pet collars not updating icons (#34184) 2018-01-12 06:17:04 -06:00
CitadelStationBot 63d8e5105b Sigils of submission now uncuff upon successful conversion 2018-01-11 21:51:30 -06:00
MoreRobustThanYouandCitadelStationBot de695abb26 Sigils of submission now uncuff upon successful conversion (#34174)
* Sigils of submission now uncuff upon successful conversion

No more retards forgetting to uncuff after conversion

* Update clock_sigils.dm
2018-01-11 21:51:30 -06:00