shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,332 Commits 5 Branches 0 Tags
a536831bbb6ca59b751a36bdcfd33c384cb0cf9c
Commit Graph

139 Commits

Author SHA1 Message Date
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
deathride58 7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465 
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
 2017-12-14 03:54:31 +00:00
vuonojenmustaturska 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
deathride58 1a1e03490a Update gygax.dm 2017-12-13 12:02:50 -05:00
Jordan Brown 129cd705d1 Correctly set description of nonstandard cells 2017-12-13 09:12:55 -06:00
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58 7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58 7ca945c96b Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370 
[MIRROR] Fixes certain material containers
 2017-12-08 19:35:43 +00:00
deathride58 6c774d7798 Update mech_fabricator.dm 2017-12-08 13:43:33 -05:00
Jordan Brown dfaa796fc2 Fixes certain material containers 2017-12-08 12:11:46 -06:00
Jordan Brown 8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06:00
XDTM 988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
deathride58 cf23ed4e14 Update mech_fabricator.dm 2017-12-05 17:42:56 -05:00
Jordan Brown e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -06:00
ACCount 435e46e407 Moves some machine sprites into /machines/ folder 2017-12-05 03:24:03 -06:00
Ashe Higgs 3689b3d5fd Mechs now require fuel to repair (#33225) 2017-12-04 04:55:25 -06:00
vuonojenmustaturska 9f9582ba5e Clean up some loc assignments (#33157) 2017-12-02 09:44:20 -06:00
Cruix b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
oranges c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
deathride58 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Jordan Brown 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordie b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
deathride58 9057436da3 Update odysseus.dm 2017-11-16 23:32:17 -05:00
oranges 952fa2a0f2 Fix conflicts between helmet/mech HUDs and HUD glasses 2017-11-16 15:39:15 -06:00
LetterJay 63fe96fba2 Update honker.dm 2017-11-12 08:08:46 -06:00
LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Iamgoofball 1e2ecf3ef7 buffs ripley mining equipment (#32509) 
* buffs ripley mining equipment

done in separate PR in case people want just this change instead of the others
1. increased range on the drill
2. halved the cooldown on the drill
3. doubled the speed of the ore pulse

* Why argue about this for days when I can just update it myself
 2017-11-09 00:44:28 -06:00
Jordan Brown 4b0362e208 Merge pull request #32209 from YPOQ/mechrechargerfix 
Fixes mech recharger integrity bar
 2017-10-30 14:41:08 -05:00
Jordan Brown 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
Emmett Gaines ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
Armhulen 0090a71bea adds logging to ripley gibs (#32032) 
* maybe this works, and maybe it doesn't

* cyberfriend

* oh right
 2017-10-24 11:25:04 -05:00
kevinz000 82f58c4ae2 Update mecha_defense.dm (#31834) 2017-10-23 08:20:02 -05:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
LetterJay 92fa0ca960 Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809 
[MIRROR] Cleans up some istypes not using helpers
 2017-10-18 07:37:43 -04:00
Leo 28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
Y0SH1M4S73R 5b57ba97ac Fixes disabling leg actuators not setting power drain per step to the correct value (#31803) 
* Adds the normal_step_energy_drain var to mechs

* Disabling leg overload sets step_energy_drain to normal_step_energy_drain instead of calling initial
 2017-10-17 13:34:53 -05:00
kevinz000 ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
LetterJay d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
Jordan Brown bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett Gaines 55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
duncathan salt c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
LetterJay 26800c1d1d Merge pull request #3267 from Citadel-Station-13/upstream-merge-31399 
[MIRROR] Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser
 2017-10-10 05:54:08 -04:00
kevinz000 a6ac800db0 Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399) 
* precision

* precision

* sanity checks

* itt kevinz doesn't know how cyberboss procs work

* fixes

* allows user cancellation

* im dumb

* itt: im still dumb

* fixes stuff, makes it set on init

* refactors reagentgrinder code

* more fixes, prevents melee attacks from going anyways

* ...? wtf is with usetopic

* Finally found out what's wrongw ith this thing.

* fixes a mistake
 2017-10-10 03:11:50 -05:00
Tad Hardesty 01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
kevinz000 7bd73f6e1d Update mecha_construction_paths.dm (#31446) 2017-10-09 19:05:25 -05:00
LetterJay fe2e29f0f8 Merge pull request #3210 from Citadel-Station-13/upstream-merge-31388 
[MIRROR] Moves assert_gas() into a define it should always have been, speeding up atmos slightly
 2017-10-08 16:19:12 -04:00
LetterJay a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386 
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
 2017-10-08 16:18:18 -04:00
CitadelStationBot 57d58163d2 [MIRROR] Overloaded leg actuators now consume at least 100 power per step (#3211) 
* Merge pull request #31389 from Y0SH1M4S73R/patch-1

Overloaded leg actuators now consume at least 100 power per step

* Overloaded leg actuators now consume at least 100 power per step
 2017-10-07 23:04:36 -07:00