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

8670 Commits

Author SHA1 Message Date
Dax Dupont 7992256bcb Grabbers can now only contain things smaller than the assembly. (#35462) 
* Grabbers can now only contain things smaller than the assembly

* Good suggestion buggy

* fucking github broke
 2018-02-11 05:08:41 -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
deathride58 33a4ef416b Merge pull request #5405 from Citadel-Station-13/upstream-merge-35493 
[MIRROR] Fixed cloning pod status not updating when autocloning.
 2018-02-11 00:50:35 +00:00
deathride58 571ad489d4 Merge pull request #5404 from Citadel-Station-13/upstream-merge-35479 
[MIRROR] Fixed chemical recipe conflicts
 2018-02-11 00:50:15 +00:00
deathride58 d598695a3a Merge pull request #5403 from Citadel-Station-13/upstream-merge-35455 
[MIRROR] Removes runlevels spec from SSoverlays
 2018-02-11 00:50:03 +00:00
deathride58 60cef5a8db Merge pull request #5401 from Citadel-Station-13/upstream-merge-35459 
[MIRROR] Fix a runtime if someone is deleted on the arrivals shuttle
 2018-02-11 00:49:36 +00:00
Jordan Brown fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Jordan Brown 3674d38a99 Merge pull request #35493 from DaxDupont/cloner 
Fixed cloning pod status not updating when autocloning.
 2018-02-10 11:09:52 -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
Jordan Brown bed3f556c8 Removes runlevels spec from SSoverlays (#35455) 2018-02-10 11:02:20 -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
CitadelStationBot 3074958a7e Merge pull request #5398 from Citadel-Station-13/upstream-merge-35465 
[MIRROR] Fixes the action button lock preference not saving
 2018-02-10 11:00:46 -06:00
Jordan Brown 564860285d Fix a runtime if someone is deleted on the arrivals shuttle (#35459) 
* Fix a runtime if someone is deleted on the arrivals shuttle

* Duh
 2018-02-10 10:28:18 -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
Robustin 25323a9b12 Fixes limbgrower having max volume of 0 (#35491) 
* Fixed limbgrower having maxvolume of 0

* Update limbgrower.dm
 2018-02-10 09:56:56 -06:00
deathride58 0283c1677b Merge pull request #5393 from Citadel-Station-13/upstream-merge-35469 
[MIRROR] Fixes map configuration values for nonexistent maps applying to box
 2018-02-10 04:01:18 +00: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
Kyle Spier-Swenson ca9ac1bdc1 Fixes map configuration values for nonexistent maps applying to box 
This caused box'es min pop to get set to 50 because all of the servers still had cere defined with that limitation.
 2018-02-09 18:13:12 -06: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 85c2f56beb Merge pull request #5323 from Raeschen/Raes_miscreanttweak 
Changed/removed some miscreant objectives.
 2018-02-09 07:47:09 -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
Nick 8ef7eea4fa Merge branch 'master' into bunnypack 2018-02-09 07:10:12 +01: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
deathride58 bf33dadc0b Merge pull request #5383 from Citadel-Station-13/upstream-merge-35428 
[MIRROR] Atom initialization counter only shows up in TESTING mode
 2018-02-09 01:30:03 +00:00
deathride58 2d488148c7 Update genetics.dm 2018-02-08 20:27:46 -05:00
Jordan Brown 5a3b322d43 Atom initialization counter only shows up in TESTING mode (#35428) 2018-02-08 16:12:53 -06: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
Improvedname 464077ef3a bunni 2018-02-08 20:31:26 +01:00
deathride58 014aeb534c Merge pull request #5377 from Citadel-Station-13/upstream-merge-35423 
[MIRROR] Fixes geiger counters on engiborgs
 2018-02-08 18:57:04 +00:00
deathride58 329f70139c RESETS AGE_MIN TO 18 2018-02-08 13:56:38 -05:00
vuonojenmustaturska 56369b7f99 Fixes geiger counters on engiborgs (#35423) 
* a commit

* Update geiger_counter.dm
 2018-02-08 11:21:27 -06:00