shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,699 Commits 5 Branches 0 Tags
2af5ee4cc56ca250a39e2ca783b97876326a2ca9
Commit Graph

4751 Commits

Author SHA1 Message Date
Jordan Brown
2af5ee4cc5 Merge pull request #34904 from ShizCalev/pancake-length 
fixes pancake runtimes
 2018-01-26 03:00:24 -06:00
LetterJay
7b06b12726 Merge pull request #5098 from Citadel-Station-13/upstream-merge-34859 
[MIRROR] Removes sulpheric acid requirement from express console circuits
 2018-01-25 14:15:06 -06:00
LetterJay
13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466 
[MIRROR] Fake nuclear disks are even more convincing
 2018-01-25 13:41:02 -06:00
Leo
45c46f721e Merge pull request #34859 from tgstation/Cyberboss-patch-4 
Removes sulpheric acid requirement from express console circuits
 2018-01-25 05:09:41 -06:00
LetterJay
9234d01b76 Merge pull request #5069 from Citadel-Station-13/upstream-merge-33773 
[MIRROR] [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common
 2018-01-25 00:51:00 -06:00
LetterJay
76fab4fccf Revert "[MIRROR] Fix old usages of trait introduced by the trait merge" 2018-01-24 23:14:51 -06:00
LetterJay
50c3debdcf Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383 
[MIRROR] You can now defib monkeys
 2018-01-24 21:45:16 -06:00
LetterJay
7fcce308b6 Merge pull request #5084 from Citadel-Station-13/upstream-merge-34894 
[MIRROR] Fix old usages of trait introduced by the trait merge
 2018-01-24 21:44:59 -06:00
LetterJay
1dffa54809 Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623 
[MIRROR] Makes templates able to use PlaceOnTop
 2018-01-24 21:44:21 -06:00
LetterJay
c30127d0d5 Merge pull request #5089 from Citadel-Station-13/upstream-merge-34841 
[MIRROR] Fixes derelict area issues
 2018-01-24 21:43:24 -06:00
LetterJay
0c43d1ef92 Merge pull request #5088 from Citadel-Station-13/upstream-merge-34838 
[MIRROR] Fixes poly's ghost SM spam
 2018-01-24 21:43:07 -06:00
LetterJay
c2df8bbacc Merge pull request #5087 from Citadel-Station-13/upstream-merge-34848 
[MIRROR] Adds new landmark icons
 2018-01-24 21:42:12 -06:00
LetterJay
2c40834c5a Merge pull request #5085 from Citadel-Station-13/upstream-merge-34699 
[MIRROR] Rename /datum/config_entry/var/value to config_entry_value
 2018-01-24 21:41:33 -06:00
LetterJay
7a8fbb08c6 Merge branch 'master' into upstream-merge-34894 2018-01-24 21:17:35 -06:00
LetterJay
8ea6f372ed Update medicine_reagents.dm 2018-01-24 20:50:21 -06:00
LetterJay
cf02adf419 Merge pull request #5081 from Citadel-Station-13/upstream-merge-34744 
[MIRROR] shuttles will now throw you if you don't buckle in
 2018-01-24 20:48:15 -06:00
LetterJay
114a1fe049 Merge pull request #5078 from Citadel-Station-13/upstream-merge-34776 
[MIRROR] Corrects mapGeneratorModule generate() args
 2018-01-24 20:47:17 -06:00
LetterJay
2d754ec8ca Merge pull request #5077 from Citadel-Station-13/upstream-merge-34801 
[MIRROR] Fixes compatability issues with some third-party-java-based™ DMM viewers
 2018-01-24 20:46:59 -06:00
LetterJay
793b4be13f Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773 
[MIRROR] Shifts vars off /mob to the correct subtype
 2018-01-24 20:46:46 -06:00
LetterJay
7ec4e826c3 Merge pull request #5067 from Citadel-Station-13/upstream-merge-34690 
[MIRROR] New Cocktail: The Nar'Sour
 2018-01-24 20:46:27 -06:00
LetterJay
0bf04c6aa6 Merge pull request #5076 from Citadel-Station-13/upstream-merge-34579 
[MIRROR] Adds Ketrazine, a powerful combat stimulant with severe side-effects which can be synthesized by the crew
 2018-01-24 20:45:51 -06:00
LetterJay
205afc5dc8 Merge pull request #5073 from Citadel-Station-13/upstream-merge-34818 
[MIRROR] Plasma cutter now has a tool sound
 2018-01-24 20:44:59 -06:00
LetterJay
d573e67ff6 Merge pull request #5072 from Citadel-Station-13/upstream-merge-34487 
[MIRROR] Costumes for nuclear operatives
 2018-01-24 20:44:43 -06:00
MoreRobustThanYou
35be96ed64 You can now defib monkeys (#34383) 
* You can now defib non-human carbons

* WOOPS

* Woops.
 2018-01-24 18:40:05 -06:00
Jordan Brown
829cf4d180 Merge pull request #34623 from ninjanomnom/template-placeontop 
Makes templates able to use PlaceOnTop
 2018-01-24 18:18:31 -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