shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,726 Commits 5 Branches 0 Tags
b55a497ffcbb1629bb16af0197b04b1869591831
Commit Graph
4450 Commits
Author SHA1 Message Date
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 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
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
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
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
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
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
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 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
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
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
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
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
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
LeoandCitadelStationBot e11e4b3385 Merge pull request #34312 from AutomaticFrenzy/patch/canister-grammar 
Fix description of relabelled canisters
 2018-01-12 07:03:20 -06:00
ShizCalevandCitadelStationBot 8bd1f07353 Fixes pet collars not updating icons (#34184) 2018-01-12 06:17:04 -06:00
ExcessiveUseOfCobblestoneandCitadelStationBot 8af2ee0fdd Pointing will now properly reflect a lack of arms (and legs!) (#34259) 
* Update emote.dm

* Update emote.dm

* Update emote.dm

* toot
 2018-01-11 21:38:08 -06:00
YPOQandCitadelStationBot 7e740208f9 Makes bot emagging more consistent (#34274) 2018-01-11 21:34:44 -06:00
AnturKandCitadelStationBot 7f9d721a72 Fixes mobs on lavaland targeting through walls on wakeup (#34280) 2018-01-11 21:33:34 -06:00
PKPenguin321andCitadelStationBot 145cc8a822 Makes cyborg module damage visible to anyone nearby (#34287) 
* swaps to_chats with visilbe_messages in damage feedback

* adds an actual alarm sound
 2018-01-11 21:32:24 -06:00
Jordan BrownandCitadelStationBot edfa926886 Move a definition to the right file (#34288) 2018-01-11 21:31:13 -06:00
kevinz000andCitadelStationBot 5920ec6996 Adds logging and feedback messages to organ manipulations by admins (#34298) 
* logging

* Update manipulate_organs.dm
 2018-01-11 21:23:21 -06:00
kevinz000andCitadelStationBot f234c471ee Fixes forensics runtimes (#34336) 2018-01-11 21:11:58 -06:00
deathride58andGitHub c0f78415a5 Merge pull request #4771 from Citadel-Station-13/upstream-merge-34270 
[MIRROR] Fixes toolarm grammar
 2018-01-12 00:41:32 +00:00
deathride58andGitHub d9e8f595b8 Merge pull request #4767 from Citadel-Station-13/upstream-merge-34146 
[MIRROR] Fixes vehicle action handling ordering
 2018-01-12 00:40:43 +00:00
LeoandCitadelStationBot 0985450524 Merge pull request #34270 from tgstation/Cyberboss-patch-3 
Fixes toolarm grammar
 2018-01-11 17:12:47 -06:00
deathride58andGitHub e17ce47aad Merge pull request #4766 from Citadel-Station-13/upstream-merge-34164 
[MIRROR] Fixes megafauna being able to port through jaunt tunnels due to snowflake code
 2018-01-11 21:33:52 +00:00
LetterJayandGitHub fe63605054 Update vehicle_actions.dm 2018-01-11 15:20:13 -06:00
LetterJayandGitHub c98be44b33 Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817 
[MIRROR] [READY]Pulling claw 2
 2018-01-11 15:19:11 -06:00
LetterJayandGitHub ef1ac1f0f3 Merge pull request #4760 from Citadel-Station-13/upstream-merge-34204 
[MIRROR] improves chem macro feedback
 2018-01-11 15:18:43 -06:00
LetterJayandGitHub fe6fb09ce7 Merge pull request #4758 from Citadel-Station-13/upstream-merge-34189 
[MIRROR] CHECK_TICK & logging for cmd_admin_areatest
 2018-01-11 15:17:24 -06:00
LetterJayandGitHub 878b16e41a Merge pull request #4757 from Citadel-Station-13/upstream-merge-34177 
[MIRROR] Prevents renaming uniquely named pets.
 2018-01-11 15:16:38 -06:00
LetterJayandGitHub 76c423e65d Merge pull request #4756 from Citadel-Station-13/upstream-merge-34168 
[MIRROR] Corrects runtime when shooting humans
 2018-01-11 15:16:16 -06:00
LetterJayandGitHub 36a5b861f6 Merge pull request #4754 from Citadel-Station-13/upstream-merge-34216 
[MIRROR] Adds Display Name Argument to Techweb Logging
 2018-01-11 15:15:54 -06:00
LetterJayandGitHub 9f9550d5ba Merge pull request #4752 from Citadel-Station-13/upstream-merge-34249 
[MIRROR] Replace CentComm with CentCom
 2018-01-11 15:15:28 -06:00
LetterJayandGitHub 387f8b973d Merge pull request #4750 from Citadel-Station-13/upstream-merge-34253 
[MIRROR] Fixes potato cells missing wires
 2018-01-11 15:14:48 -06:00
kevinz000andCitadelStationBot 583bd42772 Fixes vehicle action handling ordering 2018-01-11 14:11:52 -06:00
kevinz000andCitadelStationBot 6f96c169e1 Fixes megafauna being able to port through jaunt tunnels due to snowflake code (#34164) 
* Fixed megafauna porting through jaunt tunnels

* Update portals.dm
 2018-01-11 14:10:41 -06:00
orangesandCitadelStationBot b128c9d3b5 Merge pull request #34117 from ShizCalev/medbot-tweak 
Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
 2018-01-11 14:07:28 -06:00
Tad HardestyandCitadelStationBot 72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
arsserpentariumandCitadelStationBot 1d91243ae2 [READY]Pulling claw 2 (#33817) 
Pulling claw is integrated circuit,which allows drones to pull things.
 2018-01-11 14:03:52 -06:00
orangesandCitadelStationBot d8f232bd07 Merge pull request #34204 from ShizCalev/chem-macro-feedback 
improves chem macro feedback
 2018-01-11 14:02:35 -06:00
LeoandCitadelStationBot 337ed7f0a6 Merge pull request #34189 from ShizCalev/test-area-tick 
CHECK_TICK & logging for cmd_admin_areatest
 2018-01-11 07:40:41 -06:00
LeoandCitadelStationBot 5cb74c909c Merge pull request #34177 from ShizCalev/pet-rename 
Prevents renaming uniquely named pets.
 2018-01-11 07:40:33 -06:00
LeoandCitadelStationBot bc7b34d369 Merge pull request #34168 from ShizCalev/dna-human-runtime 
Corrects runtime when shooting humans
 2018-01-11 07:40:26 -06:00