shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,328 Commits 5 Branches 0 Tags
86cfa46c9b31c5ccd7445e7ef5e2399ade680049
Commit Graph
3964 Commits
Author SHA1 Message Date
Jordan BrownandCitadelStationBot 04ea26f6ee Merge pull request #33444 from Dorsisdwarf/gloves 
Changes captain glove description
 2017-12-11 08:59:36 -06:00
deathride58andGitHub 0389214c7b Update reagents.dm 2017-12-10 20:55:08 -05:00
ACCountandCitadelStationBot a4129f92df Fixes integrated circuit reagent components not working while in mobs, adds new helper procs 2017-12-10 19:38:06 -06:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub ccd370328c Merge branch 'master' into upstream-merge-33316 2017-12-11 00:01:02 +00:00
deathride58andGitHub 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
deathride58andGitHub 57ab98d8bc Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152 
[MIRROR] Airlock Construction Update
 2017-12-10 23:49:51 +00:00
deathride58andGitHub c116054efc Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361 
[MIRROR] Removes juicers
 2017-12-10 23:49:41 +00:00
deathride58andGitHub 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
FrozenGuy5andCitadelStationBot 9b4396f7b6 Tweaks hardsuit's armor ratings (#33428) 2017-12-10 17:45:41 -06:00
Emmett GainesandCitadelStationBot 35e8cc3e22 minor improvements (#33424) 2017-12-10 17:44:31 -06:00
coiaxandCitadelStationBot 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
LetterJayandGitHub 85578cae0d Merge pull request #4316 from deathride58/iconoverridefix 
Fixes icon_override only applying to uniforms
 2017-12-10 17:15:13 -06:00
deathride58andGitHub e46e6dcd1a Delete juicer.dm 2017-12-10 18:06:19 -05:00
deathride58andGitHub 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
deathride58andGitHub 1eb0e42bb1 Update uplink_devices.dm 2017-12-10 18:04:11 -05:00
deathride58andGitHub 68d7347c02 Update white_ship.dm 2017-12-10 17:55:46 -05:00
deathride58andGitHub 01c9cf6479 Update preferences.dm 2017-12-10 17:45:21 -05:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub fd3b0c72de Update say.dm 2017-12-10 17:01:50 -05:00
deathride58andGitHub 7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
uraniummeltdownandCitadelStationBot d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
orangesandCitadelStationBot 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
CruixandCitadelStationBot 746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers 2017-12-10 14:23:08 -06:00
LetterJayandGitHub 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
orangesandCitadelStationBot d88bff9fa9 Restores the uplink modules, removes LoadComponents 2017-12-10 14:14:37 -06:00
orangesandCitadelStationBot 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
ACCountandCitadelStationBot fd6a386779 Improves the way chem machines handle qdel, fixes some runtimes (#33415) 2017-12-10 13:25:21 -06:00
jughuandCitadelStationBot d5472ab6e4 ha (#33391) 2017-12-10 13:03:30 -06:00
Tad HardestyandCitadelStationBot 41b0dbe36f Fix MULEbot id numbers showing nowhere but the alt-click menu (#33413) 2017-12-10 12:55:12 -06:00
AnturKandCitadelStationBot 030812035f Undelaying will now reboot the server normally. (#33423) 2017-12-10 12:54:02 -06:00
coiaxandCitadelStationBot 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 BrownandCitadelStationBot 96a2a7700d Merge pull request #33396 from AnturK/tooltip-fix 
Fixes tooltip offsets
 2017-12-10 10:26:44 -06:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 1906ead618 Merge pull request #4290 from Citadel-Station-13/upstream-merge-33241 
[MIRROR] Adds some suicide acts
 2017-12-10 03:08:57 +00:00
deathride58andGitHub fe4864f8ed Merge pull request #4291 from Citadel-Station-13/upstream-merge-33365 
[MIRROR] Adds AI Vox Sound Output Circuit
 2017-12-10 03:08:19 +00:00
deathride58andGitHub 0c7bc2f3fe Merge pull request #4292 from Citadel-Station-13/upstream-merge-33376 
[MIRROR] Flickering no longer enables emergency lights
 2017-12-10 03:07:54 +00:00
deathride58andGitHub f83da95eb0 Merge pull request #4294 from Citadel-Station-13/upstream-merge-33390 
[MIRROR] cleans up atmos defines
 2017-12-10 03:07:27 +00:00
deathride58andGitHub 15b51f6c6c Merge pull request #4297 from Citadel-Station-13/upstream-merge-33384 
[MIRROR] Allows for qdel in shuttleMove procs
 2017-12-10 03:06:31 +00:00
deathride58andGitHub 79bbf1085b Merge pull request #4298 from Citadel-Station-13/upstream-merge-33389 
[MIRROR] Fixes spelling error
 2017-12-10 03:06:18 +00:00