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

7678 Commits

Author SHA1 Message Date
Jordan Brown
51e4d9f9db All color inputs use current color as default choice 2018-01-24 18:14:16 -06:00
Jordan Brown
5d4531010d Merge pull request #34841 from ShizCalev/derelict-fix 
Fixes derelict area issues
 2018-01-24 18:09:54 -06:00
Jordan Brown
fa3693c00f Merge pull request #34838 from ShizCalev/sm-godmode-fix 
Fixes poly's ghost SM spam
 2018-01-24 18:08:41 -06:00
ShizCalev
6ed56158e3 Adds new landmark icons (#34848) 
* Adds new landmark icons

* Update

* Blue
 2018-01-24 18:08:33 -06:00
Jordan Brown
3b0a00d53c Rename /datum/config_entry/var/value to config_entry_value (#34699) 
This works around some vv-fu you can use to pass in a config_entry to a proc that reads the value var of some other datum. Byond is stupid enough to actually read it, so it must be uniquely named.
 2018-01-24 15:41:19 -06:00
LetterJay
912fb88cc1 Update stamps.dm 2018-01-24 15:39:45 -06:00
Jordan Brown
2e6ce795ed Fix old usages of trait introduced by the trait merge 2018-01-24 15:18:41 -06:00
MoreRobustThanYou
53d37098fc Shuttles will now throw you when taking off 
🆑 SPACE CONDUCTOR
tweak: Shuttles will throw you around if ya don't buckle in
/🆑
 2018-01-24 14:15:51 -06:00
Leo
cb43e02276 Merge pull request #34776 from ShizCalev/mapGeneratorModule-args 
Corrects mapGeneratorModule generate() args
 2018-01-24 14:11:08 -06:00
Leo
2a0da701b2 Merge pull request #34801 from ShizCalev/DMM-viewer-fix 
Fixes compatability issues with some third-party-java-based™ DMM viewers
 2018-01-24 14:09:51 -06:00
Ordonis
00d1e8f902 Adds Ketrazine, a powerful combat stimulant with severe side-effects which can be synthesized by the crew (#34579) 
🆑 Ordo
rscadd: Adds Ketrazine, a powerful but dangerous combat stim which the crew can synthesize
/🆑
 2018-01-24 14:08:38 -06:00
ACCount12
f69e5260e2 Plasma cutter now has a tool sound 2018-01-24 14:00:51 -06:00
LetterJay
9652fc4127 Merge pull request #5064 from Citadel-Station-13/upstream-merge-34783 
[MIRROR] Cleans up duplicated code and GC issues
 2018-01-24 13:59:44 -06:00
LetterJay
8bd2a0fd03 Update jellypeople.dm 2018-01-24 13:59:02 -06:00
LetterJay
646aa3f2f8 Update alcohol_reagents.dm 2018-01-24 13:58:47 -06:00
coiax
481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -06:00
LetterJay
85a7788dd3 Merge branch 'master' into upstream-merge-34773 2018-01-24 13:58:12 -06:00
LetterJay
937d6c473a Merge pull request #5048 from Citadel-Station-13/upstream-merge-34769 
[MIRROR] Cleans up unused mob vars
 2018-01-24 13:56:23 -06:00
LetterJay
955e9ae09a Merge pull request #5063 from Citadel-Station-13/upstream-merge-34777 
[MIRROR] Corrects invalid process_fire args
 2018-01-24 13:54:23 -06:00
LetterJay
3993b42729 Merge pull request #5061 from Citadel-Station-13/upstream-merge-34826 
[MIRROR] Makes the soapstone engravings use examine to show the dialog
 2018-01-24 13:54:08 -06:00
LetterJay
1e2f180f16 Merge pull request #5060 from Citadel-Station-13/upstream-merge-34819 
[MIRROR] Makes photocopier use default_unfasten_wrench
 2018-01-24 13:53:48 -06:00
LetterJay
9c541bd1b2 Merge pull request #5057 from Citadel-Station-13/upstream-merge-34795 
[MIRROR] Fixes no eye damage being done if damage was exactly 3
 2018-01-24 13:53:11 -06:00
LetterJay
c34007cf4f Merge pull request #5056 from Citadel-Station-13/upstream-merge-34796 
[MIRROR] Fixes emergency lights having null brightness
 2018-01-24 13:52:55 -06:00
XDTM
3aa246d39b [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common 2018-01-24 13:47:40 -06:00
Robustin
fb5195aa4e New Cocktail: The Nar'Sour 2018-01-24 12:56:21 -06:00
ShizCalev
cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
Leo
a7c7e9e8ec Merge pull request #34783 from Cyberboss/FixDumbness 
Cleans up duplicated code and GC issues
 2018-01-24 11:58:37 -06:00
Leo
18d193d3ee Merge pull request #34777 from ShizCalev/process-fire 
Corrects invalid process_fire args
 2018-01-24 11:56:22 -06:00
Leo
3c72877615 Merge pull request #34826 from DaxDupont/soapstone 
Makes the soapstone engravings use examine to show the dialog
 2018-01-24 11:49:47 -06:00
Leo
307465d156 Merge pull request #34819 from ACCount12/unwrenching_standardization 
Makes photocopier use default_unfasten_wrench
 2018-01-24 11:49:39 -06:00
Shadowlight213
4a2cd205aa Fixes no eye damage being done if damage was exactly 3 2018-01-24 06:13:14 -06:00
YPOQ
8c7645fd2b Fixes emergency lights having null brightness (#34796) 2018-01-24 06:13:06 -06:00
Jordan Brown
0b2f1c2826 Merge pull request #34829 from AnturK/photosnotmovies 
Removes animation from photos
 2018-01-24 06:12:46 -06:00
Dax Dupont
e47e31ff1d Puts beakers in your hand on eject (#34787) 2018-01-24 06:12:09 -06:00
LetterJay
f4a817be01 Merge pull request #5049 from Citadel-Station-13/upstream-merge-34820 
[MIRROR] Fixes disposal initialization
 2018-01-23 10:00:33 -06:00
LetterJay
f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522 
[MIRROR] Adds ~70 more suicides
 2018-01-23 10:00:04 -06:00
LetterJay
4c2c14784b Merge pull request #5035 from Citadel-Station-13/upstream-merge-34560 
[MIRROR] Adds the Bluespace Drop Pod upgrade to the cargo express console
 2018-01-23 09:59:41 -06:00
LetterJay
ab002f56be Merge pull request #5046 from Citadel-Station-13/upstream-merge-34778 
[MIRROR] Fixes invalid pollCandidatesForMob args
 2018-01-23 08:24:31 -06:00
LetterJay
30ae21043f Merge pull request #5045 from Citadel-Station-13/upstream-merge-34476 
[MIRROR] Simple rotation component.
 2018-01-23 08:24:19 -06:00
LetterJay
9544de1693 Merge pull request #5042 from Citadel-Station-13/upstream-merge-34733 
[MIRROR] Fixes bot drop & bot assembly issues
 2018-01-23 08:23:29 -06:00
LetterJay
b603bb9fbb Merge pull request #5041 from Citadel-Station-13/upstream-merge-34767 
[MIRROR] Fix replace_random_law runtime
 2018-01-23 08:23:10 -06:00
LetterJay
6066ab31dd Update igniter.dm 2018-01-23 08:20:27 -06:00
LetterJay
888a132eff Update expressconsole.dm 2018-01-23 08:19:16 -06:00
LetterJay
9f24bac5e6 Merge pull request #5034 from Citadel-Station-13/upstream-merge-34142 
[MIRROR] Refactors infrared beams to update faster
 2018-01-23 08:18:38 -06:00
LetterJay
54d4cdd8ab Merge pull request #5031 from Citadel-Station-13/upstream-merge-34725 
[MIRROR] Fixes portal storm event
 2018-01-23 08:17:33 -06:00
LetterJay
fa0823c27d Merge pull request #5030 from Citadel-Station-13/upstream-merge-34727 
[MIRROR] Stops simple_animals from attacking mobs in godmode
 2018-01-23 08:17:21 -06:00
LetterJay
75af3bc248 Merge pull request #5029 from Citadel-Station-13/upstream-merge-34742 
[MIRROR] Removes pulling claw instant messageless stun
 2018-01-23 08:17:09 -06:00
AnturK
f70c357111 Fixes disposal initialization (#34820) 2018-01-23 06:46:45 -06:00
Leo
90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
Leo
326228c43c Merge pull request #34778 from ShizCalev/pollCandidatesForMob 
Fixes invalid pollCandidatesForMob args
 2018-01-23 06:42:08 -06:00