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

4773 Commits

Author SHA1 Message Date
deathride58
86fa4871a6 Merge pull request #5114 from Citadel-Station-13/upstream-merge-34910 
[MIRROR] Fixes Ketrazine recipe
 2018-01-26 15:54:25 +00:00
deathride58
870f2320b5 Merge pull request #5112 from Citadel-Station-13/upstream-merge-34906 
[MIRROR] Removes Sulfuric Acid requirements from computer parts
 2018-01-26 15:53:14 +00:00
deathride58
d8434f2b4a Merge pull request #5111 from Citadel-Station-13/upstream-merge-34904 
[MIRROR] fixes pancake runtimes
 2018-01-26 15:52:55 +00:00
deathride58
ebfa263653 Merge pull request #5110 from Citadel-Station-13/upstream-merge-34897 
[MIRROR] Fixes orbiting stopping when entering disposals
 2018-01-26 15:52:39 +00:00
deathride58
a539f6103a Merge pull request #5107 from Citadel-Station-13/upstream-merge-34881 
[MIRROR] Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 15:50:38 +00:00
deathride58
20eca7bc22 Merge pull request #5106 from Citadel-Station-13/upstream-merge-34852 
[MIRROR] Power Cell explosions are now log
 2018-01-26 15:49:55 +00:00
deathride58
5e6000d02d Merge pull request #5104 from Citadel-Station-13/upstream-merge-34900 
[MIRROR] Syringe update_icon sanity
 2018-01-26 15:48:53 +00:00
deathride58
9118715588 Merge pull request #5103 from Citadel-Station-13/upstream-merge-34901 
[MIRROR] Fixes brains being left in hands after being inserted into heads
 2018-01-26 15:48:28 +00:00
deathride58
5bc3ad8016 Merge pull request #5102 from Citadel-Station-13/upstream-merge-34876 
[MIRROR] Nuke op intelligence potions also grant an internal ID
 2018-01-26 15:47:56 +00:00
deathride58
8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755 
[MIRROR] All color inputs use current color as default choice
 2018-01-26 15:44:23 +00:00
deathride58
4008898f54 Merge pull request #5054 from Citadel-Station-13/upstream-merge-34829 
[MIRROR] Removes animation from photos
 2018-01-26 15:39:38 +00:00
Jordan Brown
5db9ca3085 Merge pull request #34910 from GuppyLaxx/idk 
Fixes Ketrazine recipe
 2018-01-26 03:00:52 -06:00
Jordan Brown
c381c639cb Merge pull request #34906 from epochayur/master 
Removes Sulfuric Acid requirements from computer parts
 2018-01-26 03:00:32 -06:00
Jordan Brown
2af5ee4cc5 Merge pull request #34904 from ShizCalev/pancake-length 
fixes pancake runtimes
 2018-01-26 03:00:24 -06:00
Jordan Brown
d0c648b702 Merge pull request #34897 from YPOQ/orbitfix 
Fixes orbiting stopping when entering disposals
 2018-01-26 03:00:16 -06:00
Jordan Brown
f2d75f1439 Merge pull request #34881 from Robustin/paxPK 
Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 02:59:45 -06:00
Jordan Brown
ffffd35345 Merge pull request #34852 from Iamgoofball/patch-376 
Power Cell explosions are now log
 2018-01-26 02:59:36 -06:00
ShizCalev
e4a96fe2cd Syringe update_icon sanity 2018-01-26 02:59:21 -06:00
YPO
f51fcc835f Fixes brains being left in hands after being inserted into heads 2018-01-26 02:59:12 -06:00
Jack Edge
a07c6c4d9e Nuke op intelligence potions also grant an internal ID 
🆑 coiax
add: Syndicate intelligence potions also grant an internal syndicate ID
card to the simple animal granted intelligence. This effectively means
that Cayenne can open the airlocks on the Infiltrator.
/🆑

And also maintenance I guess. But she could already smash her way
through doors.

Why? So Cayenne can open airlocks on the infiltrator. That's why.
 2018-01-26 02:59:04 -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
cd17afba45 Update preferences.dm 2018-01-24 21:44:00 -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
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