shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,496 Commits 5 Branches 0 Tags
cdcb5fc72f34eb8a5276f214f4ab765ab0d66c4e
Commit Graph

4980 Commits

Author SHA1 Message Date
Mokiros
cdcb5fc72f Buildable and upgradable All-In-One Grinder (#35451) 
Circuit is in "Biological Processing" techweb node
 2018-02-11 05:12:23 -06:00
deathride58
21be004afa Merge pull request #5406 from Citadel-Station-13/upstream-merge-35424 
[MIRROR] Replaces some var values with defines
 2018-02-11 02:24:48 +00:00
deathride58
a34dc0b90b Update personality.dm 2018-02-10 19:51:21 -05:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Jordan Brown
bd0b5c2eb5 Merge pull request #35479 from Cruix/chem_collisions 
Fixed chemical recipe conflicts
 2018-02-10 11:04:34 -06:00
CitadelStationBot
d68892983c Merge pull request #5400 from Citadel-Station-13/upstream-merge-35449 
[MIRROR] Integrated Circutry Readability Improvements
 2018-02-10 11:01:08 -06:00
CitadelStationBot
9909e94c9e Merge pull request #5399 from Citadel-Station-13/upstream-merge-35437 
[MIRROR] Fixes Morphine So that it can be made.
 2018-02-10 11:00:56 -06:00
Trevor Serpas
86e5775599 Integrated Circutry Readability Improvements (#35449) 
* Integrated Circutry Readability Improvements

* support for old save files and fix a var I missed
 2018-02-10 10:04:42 -06:00
Ordonis
0e22f30c39 Switched nitrogen for ethanol in morphine recipe. (#35437) 
* Fixes Ordo not testing shit properly

* Lowers yield for balance purposes

Fug
 2018-02-10 10:00:25 -06:00
Ashe Higgs
dd6a2541f4 Fixes button lock not saving (#35465) 2018-02-10 09:58:11 -06:00
deathride58
1b7658b4a5 Merge pull request #5392 from Citadel-Station-13/upstream-merge-35422 
[MIRROR] Removes uneedful code
 2018-02-10 04:00:34 +00:00
deathride58
9f37b3b70b Merge pull request #5391 from Citadel-Station-13/upstream-merge-35461 
[MIRROR] Hatchets are now small instead of tiny.
 2018-02-10 04:00:21 +00:00
deathride58
a46fdf8750 Merge pull request #5390 from Citadel-Station-13/upstream-merge-35463 
[MIRROR] Cell blueprints now use the /empty variants
 2018-02-10 04:00:08 +00:00
deathride58
935f070368 Merge pull request #5389 from Citadel-Station-13/upstream-merge-35476 
[MIRROR] Fix goliath hide plates not applying to suits correctly
 2018-02-10 03:59:54 +00:00
deathride58
9d96a6b78f Merge pull request #5388 from Citadel-Station-13/upstream-merge-35446 
[MIRROR] can_synth uses TRUE/FALSE
 2018-02-10 03:59:39 +00:00
deathride58
41db15db60 Merge pull request #5387 from Citadel-Station-13/upstream-merge-35454 
[MIRROR] Adds defib to techwebs
 2018-02-10 03:59:23 +00:00
deathride58
e3decd794d Merge pull request #5386 from Citadel-Station-13/upstream-merge-35453 
[MIRROR] Aluminium with two i
 2018-02-10 03:59:08 +00:00
Jordan Brown
c554bc8c47 Removes uneedful code 2018-02-09 14:23:45 -06:00
Dax Dupont
94dfbced99 Hatchets are now small instead of tiny. 2018-02-09 14:22:34 -06:00
Jordan Brown
38fe1ac2fe Cell blueprints now use the /empty variants (#35463) 
* Cell blueprints now use the /empty variants

* Add empty stock cell
 2018-02-09 12:50:46 -06:00
vuonojenmustaturska
023ab1c5ec Merge pull request #35476 from AutomaticFrenzy/patch/goliath-hide 
Fix goliath hide plates not applying to suits correctly
 2018-02-09 12:49:34 -06:00
vuonojenmustaturska
73cd1ec431 Merge pull request #35446 from 81Denton/can-synth 
can_synth uses TRUE/FALSE
 2018-02-09 12:49:26 -06:00
Jordan Brown
1ee8b3762b Merge pull request #35454 from DaxDupont/You-didn't-have-to-smile-at-me,-Your-grin's-the-sweetest-that-I've-ever-seen,But-you-did.-Yes-you-did 
Adds defib to techwebs
 2018-02-09 12:49:18 -06:00
Jordan Brown
3076575c34 Merge pull request #35453 from 81Denton/aluminium-with-two-i 
Aluminium with two i
 2018-02-09 12:49:08 -06:00
Jordan Brown
5082056ef9 Merge pull request #35452 from 81Denton/crush-a-can-for-jay-owen 
Removes grind_results from empty soda cans
 2018-02-09 12:48:59 -06:00
CitadelStationBot
8fb72176be Merge pull request #5384 from deathride58/iamgoingtoregretthis 
Makes input boxes for emotes larger.
 2018-02-09 07:46:28 -06:00
deathride58
3fb0579762 Merge pull request #5379 from Citadel-Station-13/upstream-merge-35426 
[MIRROR] adds italian moustache that makes you italian
 2018-02-09 03:01:08 +00:00
deathride58
832ac9a64a makes emote input text boxes larger 2018-02-08 21:47:29 -05:00
Jordan Brown
623513ab24 Merge pull request #35419 from kevinz000/patch-446 
fixes beam rifle zooming
 2018-02-08 15:18:40 -06:00
PKPenguin321
bdab8a71d9 adds italian moustache that makes you italian 2018-02-08 14:30:30 -06:00
vuonojenmustaturska
56369b7f99 Fixes geiger counters on engiborgs (#35423) 
* a commit

* Update geiger_counter.dm
 2018-02-08 11:21:27 -06:00
deathride58
3762b9c474 Merge pull request #5376 from Citadel-Station-13/upstream-merge-35410 
[MIRROR] Fixes primary AI spawning at incorrect locations
 2018-02-08 16:26:33 +00:00
Jordan Brown
28fe3df885 Merge pull request #35410 from ShizCalev/ai-loc-fix 
Fixes primary AI spawning at incorrect locations
 2018-02-08 09:06:14 -06:00
Jordan Brown
ee77e12bca Merge pull request #35412 from DaxDupont/flags-are-for-fags 
Brings certain designs in line with others.
 2018-02-08 09:04:46 -06:00
LetterJay
7a13591920 Merge pull request #5371 from Citadel-Station-13/upstream-merge-35388 
[MIRROR] Adds basic trailer support to vehicles
 2018-02-08 07:13:04 -06:00
LetterJay
e4319100b5 Merge pull request #5369 from Citadel-Station-13/upstream-merge-35275 
[MIRROR] SM can explode on space tiles again
 2018-02-08 07:12:32 -06:00
LetterJay
e3067e835a Merge pull request #5368 from Citadel-Station-13/upstream-merge-34834 
[MIRROR] Circuit drone + grabber/thrower balance changes
 2018-02-08 07:12:13 -06:00
LetterJay
e548295398 Merge pull request #5367 from Citadel-Station-13/upstream-merge-35346 
[MIRROR] Fixes cyborg related cuffing issues
 2018-02-08 07:11:52 -06:00
LetterJay
35103d74bd Merge pull request #5366 from Citadel-Station-13/upstream-merge-35296 
[MIRROR] Heart Disease 2: Electric Boogaloo
 2018-02-08 07:11:42 -06:00
LetterJay
bf84d1502b Merge pull request #5365 from Citadel-Station-13/upstream-merge-35399 
[MIRROR] [s]Closes exploits in proc calling admin datum procs.
 2018-02-08 07:10:55 -06:00
Iamgoofball
1cc72fb3d4 Adds basic trailer support to vehicles (#35388) 
* Adds basic trailer support to vehicles

* Move compat.
 2018-02-08 03:22:07 -06:00
Dax Dupont
6dc78e0201 SM can explode on space tiles again (#35275) 
* Reordered some of the SM logic

* make it a little slower

* It does not explode instantly i tested
 2018-02-08 03:13:28 -06:00
Evsey Antonovich
c066120fc0 Circuit drone + grabber/thrower balance changes (#34834) 
* makes grabbers bulky and inventory max bulky

* makes circuit drones bulky

* removes drone stacking

* made grabbers max w class based on drone assembly, changed their w class back to small

* review stuff

* makes throwers max_w_class depend on assembly size

* uh

* kills sheer heart attack

* fuck off

* FUCK

* GR
 2018-02-08 03:11:12 -06:00
oranges
d427e0174b Merge pull request #35346 from DaxDupont/kinky-cuffs 
Fixes cyborg related cuffing issues
 2018-02-08 03:07:51 -06:00
MoreRobustThanYou
9c957f5a0b Heart Disease 2: Electric Boogaloo (#35296) 
* Heart Disease 2: Electric Boogaloo

* Upd8
 2018-02-08 03:02:29 -06:00
Kyle Spier-Swenson
06a1d39595 [s]Closes exploits in proc calling admin datum procs. (#35399) 
* Closes exploits in proc calling admin datum procs.

There is likely one in ranks, but that can be its own pr.

* Update holder2.dm
 2018-02-08 02:55:07 -06:00
oranges
76ec67f246 Merge pull request #35401 from MrStonedOne/patch-475 
[s]Closes exploits in proc calling admin rank datum procs.
 2018-02-08 02:54:55 -06:00
LetterJay
c8b7e5dc7a Merge pull request #5362 from Michiyamenotehifunana/nekomimi-port 
Ports TG's nekomimi to Cit's mammal sprite accessories system
 2018-02-08 00:30:31 -06:00
Michiyamenotehifunana
ca8a8e12bf Ports TG nekomimi to Cit's mammal sprite accessories system 2018-02-08 12:59:01 +08:00
MMMiracles
2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168) 
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
 2018-02-07 20:23:32 -06:00