shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,362 Commits 5 Branches 0 Tags
6581eb8526e9efe8ebea611cca43658bd650ca3c
Commit Graph

110 Commits

Author SHA1 Message Date
Jordan Brown
4b0362e208 Merge pull request #32209 from YPOQ/mechrechargerfix 
Fixes mech recharger integrity bar
 2017-10-30 14:41:08 -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
Jordan Brown
4f32b7a0d4 Moves assert_gas() into a define it should always have been, speeding up atmos slightly 2017-10-07 13:37:28 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
AnturK
67f0c2f41c Fixes mech fab runtime (#31232) 
* Dunno what the initial was about, it's a list.

* Proper fixup

* Typo
 2017-10-03 18:19:40 -05:00
LetterJay
865f057d7b Update mecha_control_console.dm 2017-10-02 17:32:11 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
ShizCalev
f8f599b17b Stops putting RCD, bluespace bags, and staves into ORM 2017-09-29 19:33:37 -05:00
LetterJay
31a9164362 Update combat.dm 2017-09-27 16:27:21 -05:00
GLACoding
7b3fa9bdb1 Adds installing cells as part of mech construction and fixes some mech construction bugs. 2017-09-27 04:14:22 -05:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643) 
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
 2017-09-22 22:30:44 -05:00
CitadelStationBot
3e2f638793 [MIRROR] Cleans up internal temp code (#2853) 
* Cleans up internal temp code (#30715)

* cleanup

* Update living.dm

* Update atoms.dm

* Update objs.dm

* Cleans up internal temp code

* Update living.dm

* Update living.dm

* fixes then ommits mob_temp stuff.

* wew lad. commenting shit out is picky af.
 2017-09-22 20:20:56 -05:00
Poojawa
573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -05:00
CitadelStationBot
4bc6e9d522 [MIRROR] Cleaned up some decimal values. (#2797) 
* Cleaned up some decimal values.

* Update gas_mixture.dm

* Update color.dm

* Update medsci.dm
 2017-09-18 01:45:39 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
kevinz000
ee5c44191d adds logging to graivpult precision throwing (#30608) 
* Update other_tools.dm

* Update other_tools.dm

* Update other_tools.dm
 2017-09-12 17:14:22 -05:00
LetterJay
eeadba6f18 Merge pull request #2696 from Citadel-Station-13/upstream-merge-30494 
[MIRROR] Adds missing span-endings
 2017-09-12 06:32:45 -05:00
LetterJay
6413dd5264 Merge pull request #2699 from Citadel-Station-13/upstream-merge-30551 
[MIRROR] Mechs now can be connected to atmos ports
 2017-09-12 03:19:23 -05:00
LetterJay
dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
MrROBUST
2812a72cca Mechs now can be connected to atmos ports (#30551) 
* Mechs now can be connected to atmos ports

* Using internal_tank instead of dead code.

* Apply Cyberboss's advises

Corrected stupid typos

* Broke connection if external powers move mech

Remove forgotten comment

* get_turf(src)
 2017-09-11 12:25:33 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
ExcessiveUseOfCobblestone
33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
LetterJay
24a7aa5a9f Merge branch 'master' into upstream-merge-30079 2017-09-06 09:24:23 -05:00
LetterJay
bae0563d47 initial commit 2017-09-05 16:17:50 -05:00
Poojawa
5f1d88ffeb Revert "[MIRROR] Port material containers to datum components" (#2597) 
* Revert "sprite fix on kitsune tails"

This reverts commit 44d5b21a43.

* Revert "Update vg_clothing_packs.dm (#2591)"

This reverts commit 7f46280d6b.

* Revert "Automatic changelog generation for PR #2590 [ci skip]"

This reverts commit 201e07033f.

* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"

This reverts commit 5c98b9a13b.

* Revert "Quick sync (#2587)"

This reverts commit 92e055be97.

* Revert "Automatic changelog generation for PR #2557 [ci skip]"

This reverts commit 241a10d88d.

* Revert "Decreases hacked ai module cost (#2557)"

This reverts commit d959b7538a.

* Revert "[MIRROR] Port material containers to datum components (#2562)"

This reverts commit 32300086d5.
 2017-09-04 09:07:40 -05:00
CitadelStationBot
32300086d5 [MIRROR] Port material containers to datum components (#2562) 
* Port material containers to datum components

* Fixes Rej
 2017-09-04 04:08:42 -05:00
LetterJay
78ed8f0913 Fixes mecha drill not working on windoors. 2017-09-02 05:35:36 -05:00
kevinz000
5591afc9ce double wew 2017-08-29 09:53:11 -07:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00