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

8270 Commits

Author SHA1 Message Date
Jordan Brown
01f89292a2 Adds hotspots to chasm blacklist (#34858) 
* Adds hotspots to chasm blacklist

* Blacklists landmarks from chasms
 2018-01-25 05:10:59 -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
63bea9d1fc Revert "[MIRROR] Forces test run to run with a set random seed" 2018-01-25 00:17:33 -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
d73cd1d35f Merge pull request #5095 from Citadel-Station-13/upstream-merge-34752 
[MIRROR] Clown traitors can buy clown bombs now
 2018-01-24 21:45:51 -06:00
LetterJay
5c32347a9f Merge pull request #5094 from Citadel-Station-13/upstream-merge-34912 
[MIRROR] Forces test run to run with a set random seed
 2018-01-24 21:45:41 -06:00
LetterJay
a090f2823d Merge pull request #5093 from Citadel-Station-13/upstream-merge-34827 
[MIRROR] Spawns a pen-uplink if you don't have one /w pen pref.
 2018-01-24 21:45:29 -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
imsxz
e9cdf72439 less than 100 2018-01-24 21:23:37 -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
b89007ade5 Merge pull request #5080 from Citadel-Station-13/upstream-merge-34746 
[MIRROR] Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 20:48:03 -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
dd31c777a5 Merge pull request #5068 from Citadel-Station-13/upstream-merge-34807 
[MIRROR] Fixes the kitchen spike turning people upside down forever
 2018-01-24 20:46:16 -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
8f62c0823a Merge pull request #5075 from Citadel-Station-13/upstream-merge-34800 
[MIRROR] martial art sanity check
 2018-01-24 20:45:33 -06:00
LetterJay
f0b83ee23d Merge pull request #5074 from Citadel-Station-13/upstream-merge-34611 
[MIRROR] One can no longer use cogscarab as a form of Eminence priority.
 2018-01-24 20:45:16 -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
LetterJay
cbaca56dbf Merge pull request #5071 from Citadel-Station-13/upstream-merge-34458 
[MIRROR] Refactors and nerfs Fleshmend
 2018-01-24 20:44:30 -06:00
LetterJay
ad50662c94 Merge pull request #5070 from Citadel-Station-13/upstream-merge-34285 
[MIRROR] Gives clockwork marauders a reasonable cost/cooldown
 2018-01-24 20:44:15 -06:00
Jordan Brown
a8bd042742 Forces test run to run with a set random seed (#34912) 2018-01-24 19:28:18 -06:00
ExcessiveUseOfCobblestone
596aea6bbb Spawns a pen-uplink if you don't have one /w pen pref. (#34827) 
* Update mind.dm

* ok togopal i guess you could call that a webedit

* AHHHHHH

* xhuis

* I only had 1 cup of coffee today ok

* dost thou hast storage?

* cb

* we did it... we finally did it.
 2018-01-24 18:45:21 -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
072056f919 Update fleshmend.dm 2018-01-24 15:40:05 -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
oranges
8b2da0aa90 Merge pull request #34746 from DaxDupont/autolathe 
Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 14:14:37 -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
Leo
c3ba7008d1 Merge pull request #34800 from ShizCalev/everybody-was-kungfoo-fighting 
martial art sanity check
 2018-01-24 14:07:24 -06:00
ExcessiveUseOfCobblestone
eb1a6b89ef One can no longer use cogscarab as a form of Eminence priority. (#34611) 
Cogscarabs are meant to build, and wasting an integral (building) slot for something you can get as a ghost so you get priority is shitty to both other ghosts and team (the second one being an admin issue).

If you want to go eminence, you can roll for it as a ghost like everyone else.
 2018-01-24 14:03:08 -06:00
ACCount12
f69e5260e2 Plasma cutter now has a tool sound 2018-01-24 14:00:51 -06:00