shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,744 Commits 5 Branches 0 Tags
90b35d405a35effbdbb3b9cfe6010fba784cfecb
Commit Graph

7783 Commits

Author SHA1 Message Date
deathride58
90b35d405a Merge pull request #4796 from Citadel-Station-13/upstream-merge-33699 
[MIRROR] Makes vault safe slightly less explosion-proof
 2018-01-13 20:22:05 +00:00
deathride58
9ccd21605d Merge pull request #4795 from Citadel-Station-13/pbchange 
Panic bunker notice change
 2018-01-13 20:21:43 +00:00
deathride58
e9785d8512 Merge pull request #4794 from Citadel-Station-13/upstream-merge-34296 
[MIRROR] Fixes stimulum running out before the next breath
 2018-01-13 20:21:21 +00:00
deathride58
80c4d1d92e Merge pull request #4793 from Citadel-Station-13/upstream-merge-34313 
[MIRROR] Fix airlock console HTML
 2018-01-13 20:21:03 +00:00
deathride58
9c28302717 Merge pull request #4792 from Citadel-Station-13/upstream-merge-34316 
[MIRROR] Fixes poker tables not being deleted after Narsie touches them
 2018-01-13 20:20:43 +00:00
oranges
e164b0cf25 Merge pull request #33699 from QualityVan/safedestruction 
Makes vault safe slightly less explosion-proof
 2018-01-13 04:17:27 -06:00
LetterJay
6a9545db8a Panic bunker notice change 2018-01-12 23:22:36 -06:00
LetterJay
29287f84db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2018-01-12 20:05:58 -06:00
LetterJay
72a9030f6a donate fix 2018-01-12 20:05:50 -06:00
kevinz000
54b356a227 Fixes stimulum running out before the next breath (#34296) 2018-01-12 13:05:12 -06:00
Leo
9c17444c5f Merge pull request #34313 from AutomaticFrenzy/patch/airlock-controller 
Fix airlock console HTML
 2018-01-12 12:57:52 -06:00
Leo
1d729e7d6d Merge pull request #34316 from tgstation/Cyberboss-patch-4 
Fixes poker tables not being deleted after Narsie touches them
 2018-01-12 12:30:15 -06:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
ed3779feff Merge pull request #4772 from Citadel-Station-13/upstream-merge-34336 
[MIRROR] Fixes forensics runtimes
 2018-01-12 17:42:05 +00:00
deathride58
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
deathride58
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
Leo
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
JJRcop
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
Leo
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
Leo
e11e4b3385 Merge pull request #34312 from AutomaticFrenzy/patch/canister-grammar 
Fix description of relabelled canisters
 2018-01-12 07:03:20 -06:00
ShizCalev
8bd1f07353 Fixes pet collars not updating icons (#34184) 2018-01-12 06:17:04 -06:00
MoreRobustThanYou
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
ExcessiveUseOfCobblestone
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
Dax Dupont
af73323477 Adds an indestructible disco/dance machine for admemes and disco inferno shuttle (#34260) 
* Dance machine fix

* I have no ass and i must blast
 2018-01-11 21:36:56 -06:00
YPOQ
7e740208f9 Makes bot emagging more consistent (#34274) 2018-01-11 21:34:44 -06:00
AnturK
7f9d721a72 Fixes mobs on lavaland targeting through walls on wakeup (#34280) 2018-01-11 21:33:34 -06:00
PKPenguin321
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 Brown
edfa926886 Move a definition to the right file (#34288) 2018-01-11 21:31:13 -06:00
Jordan Brown
bea8dae8c4 Add /datum prefix to custom root types (#34294) 2018-01-11 21:28:02 -06:00
Jordan Brown
08da9ea5a0 Fixes brass skewer grammar 2018-01-11 21:26:43 -06:00
kevinz000
08339940c1 Update ark_of_the_clockwork_justicar.dm (#34297) 2018-01-11 21:24:31 -06:00
kevinz000
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
kevinz000
f234c471ee Fixes forensics runtimes (#34336) 2018-01-11 21:11:58 -06:00
LetterJay
2b9b826a95 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2018-01-11 20:38:06 -06:00
LetterJay
946d0243ce donation item fix 2018-01-11 20:37:54 -06:00