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

3920 Commits

Author SHA1 Message Date
deathride58
5535509a65 fixes broken metabolism 2017-12-12 15:15:22 -05:00
AnturK
c5013d65f6 Adds "Get" command to movable vv dropdown (#33296) 2017-12-11 20:35:16 -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
b5600cb91c Merge pull request #4328 from Citadel-Station-13/upstream-merge-33462 
[MIRROR] Ordered turfs quickfix
 2017-12-11 19:08:09 +00:00
Leo
9a0961c320 Merge pull request #33462 from ninjanomnom/dont-be-so-negative 
Ordered turfs quickfix
 2017-12-11 12:15:29 -06:00
kevinz000
d22aee94a1 Fixes nulls (#33440) 2017-12-11 11:31:27 -06:00
Jordan Brown
04ea26f6ee Merge pull request #33444 from Dorsisdwarf/gloves 
Changes captain glove description
 2017-12-11 08:59:36 -06:00
deathride58
0389214c7b Update reagents.dm 2017-12-10 20:55:08 -05:00
ACCount
a4129f92df Fixes integrated circuit reagent components not working while in mobs, adds new helper procs 2017-12-10 19:38:06 -06:00
deathride58
051b45c680 Merge pull request #4254 from Citadel-Station-13/upstream-merge-33316 
[MIRROR] Adds games vendor resupply crate
 2017-12-11 00:46:00 +00:00
deathride58
fdefdef3e7 Merge pull request #4319 from Citadel-Station-13/upstream-merge-33428 
[MIRROR] Small Rebalance to hardsuit's armor ratings
 2017-12-11 00:20:56 +00:00
deathride58
71c3a8266a Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424 
[MIRROR] Standardization of return_ordered_turfs
 2017-12-11 00:06:54 +00:00
deathride58
c211552c9d Merge pull request #4317 from Citadel-Station-13/upstream-merge-33309 
[MIRROR] Silver slime extract foods now fry correctly
 2017-12-11 00:03:05 +00:00
deathride58
ccd370328c Merge branch 'master' into upstream-merge-33316 2017-12-11 00:01:02 +00:00
deathride58
d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148 
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
 2017-12-10 23:50:20 +00:00
deathride58
57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00
deathride58
c116054efc Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361 
[MIRROR] Removes juicers
 2017-12-10 23:49:41 +00:00
deathride58
6e6b85c01a Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276 
[MIRROR] Restores the uplink modules, removes LoadComponents
 2017-12-10 23:49:25 +00:00
FrozenGuy5
9b4396f7b6 Tweaks hardsuit's armor ratings (#33428) 2017-12-10 17:45:41 -06:00
Emmett Gaines
35e8cc3e22 minor improvements (#33424) 2017-12-10 17:44:31 -06:00
coiax
6846e87ae2 Silver slime extract foods now fry correctly (#33309) 
* Silver slime extract foods now fry correctly

The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.

- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.

* Contains
 2017-12-10 17:42:20 -06:00
LetterJay
85578cae0d Merge pull request #4316 from deathride58/iconoverridefix 
Fixes icon_override only applying to uniforms
 2017-12-10 17:15:13 -06:00
deathride58
e46e6dcd1a Delete juicer.dm 2017-12-10 18:06:19 -05:00
deathride58
0475ef46f7 Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150 
[MIRROR] Makes actionbuttons remember positions where you locked them.
 2017-12-10 23:04:34 +00:00
deathride58
1eb0e42bb1 Update uplink_devices.dm 2017-12-10 18:04:11 -05:00
deathride58
68d7347c02 Update white_ship.dm 2017-12-10 17:55:46 -05:00
deathride58
01c9cf6479 Update preferences.dm 2017-12-10 17:45:21 -05:00
deathride58
216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
 2017-12-10 22:43:58 +00:00
deathride58
94d0293703 Merge pull request #4305 from Citadel-Station-13/upstream-merge-33413 
[MIRROR] Fix MULEbot ID numbers showing nowhere but the alt-click menu
 2017-12-10 22:39:02 +00:00
deathride58
fd3b0c72de Update say.dm 2017-12-10 17:01:50 -05:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58
b66e664f11 Merge pull request #4309 from Citadel-Station-13/upstream-merge-33415 
[MIRROR] Improves the way chem machines handle qdel, fixes some runtimes
 2017-12-10 21:45:01 +00:00
deathride58
fa42a336f3 Merge pull request #4310 from Citadel-Station-13/upstream-merge-33320 
[MIRROR] Fix runtimes using Tweak Component Ratings on non-machines
 2017-12-10 21:44:34 +00:00
deathride58
1a8dd315f9 Merge pull request #4306 from Citadel-Station-13/upstream-merge-33391 
[MIRROR] Fixes butchered cats not dropping their ears and tails
 2017-12-10 21:43:59 +00:00
deathride58
215a8f47ed Merge pull request #4304 from Citadel-Station-13/upstream-merge-33423 
[MIRROR] Undelaying roundend will now reboot the server normally.
 2017-12-10 21:43:26 +00:00
deathride58
85ccdac4d7 fixes icon_override only applying to uniforms 2017-12-10 16:37:28 -05:00
uraniummeltdown
d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
oranges
30143ee601 Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE 
[READY]Fixes beam rifles and flightsuits
 2017-12-10 15:19:18 -06:00
Cruix
746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers 2017-12-10 14:23:08 -06:00
LetterJay
d82698d106 Merge pull request #4302 from Citadel-Station-13/upstream-merge-33280 
[MIRROR] Add caltrop component for spikey floor objects
 2017-12-10 14:20:40 -06:00
oranges
d88bff9fa9 Restores the uplink modules, removes LoadComponents 2017-12-10 14:14:37 -06:00
oranges
38da8cb545 Merge pull request #33320 from AutomaticFrenzy/patch/component-ratings 
Fix runtimes using Tweak Component Ratings on non-machines
 2017-12-10 14:08:21 -06:00
ACCount
fd6a386779 Improves the way chem machines handle qdel, fixes some runtimes (#33415) 2017-12-10 13:25:21 -06:00
jughu
d5472ab6e4 ha (#33391) 2017-12-10 13:03:30 -06:00
Tad Hardesty
41b0dbe36f Fix MULEbot id numbers showing nowhere but the alt-click menu (#33413) 2017-12-10 12:55:12 -06:00
AnturK
030812035f Undelaying will now reboot the server normally. (#33423) 2017-12-10 12:54:02 -06:00
coiax
9d59e36289 Add caltrop component for spikey floor objects (#33280) 
* Add caltrop component for spikey floor objects

The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.

This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.

Also, it taught me how components work.

* Code review I

* Caltrop damage is 4

* Cactus hurts

* Whoops

* Ignore restraints = true
 2017-12-10 10:32:03 -06:00
Jordan Brown
96a2a7700d Merge pull request #33396 from AnturK/tooltip-fix 
Fixes tooltip offsets
 2017-12-10 10:26:44 -06:00
deathride58
e18457f92e Merge pull request #4284 from Citadel-Station-13/upstream-merge-33356 
[MIRROR] Fixes meth explosions throwing warnings
 2017-12-10 03:12:19 +00:00
deathride58
a17e7ae3cf Merge pull request #4283 from Citadel-Station-13/upstream-merge-33358 
[MIRROR] Replace pAI verb tab with an action button
 2017-12-10 03:11:54 +00:00