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

3899 Commits

Author SHA1 Message Date
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
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
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
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
79bbf1085b Merge pull request #4298 from Citadel-Station-13/upstream-merge-33389 
[MIRROR] Fixes spelling error
 2017-12-10 03:06:18 +00:00
Jordan Brown
0c93857bc5 Merge pull request #33389 from LuigiBoi/patch-1 
Fixes spelling error
 2017-12-09 15:54:06 -06:00
Jordan Brown
b6653dd94c Merge pull request #33384 from ninjanomnom/deletes-in-my-shutle-subsystem 
Allows for qdel in shuttleMove procs
 2017-12-09 15:53:57 -06:00
Jordan Brown
2029473a48 Merge pull request #33397 from Xhuis/em_light_fix 
Fixes emergency lights having infinite power, and replaces their magic number with a define
 2017-12-09 15:53:49 -06:00
Jordan Brown
7a90baa1f8 Merge pull request #33390 from duncathan/atmos-defines 
cleans up atmos defines
 2017-12-09 15:53:34 -06:00
Jordan Brown
7b9bcb37aa Merge pull request #33376 from Xhuis/patch-3 
Flickering no longer enables emergency lights
 2017-12-09 15:53:20 -06:00
Jordan Brown
3de5ed055f Merge pull request #33365 from KomradeSpectre/vox_circuit 
Adds AI Vox Sound Output Circuit
 2017-12-09 15:53:12 -06:00
Jordan Brown
70be12aa1c Merge pull request #33241 from swindly/suicide 
Adds some suicide acts
 2017-12-09 15:52:53 -06:00
ACCount
3c9758fe80 Fixes meth explosion throwing warnings (#33356) 2017-12-09 01:09:04 -06:00
Tad Hardesty
0a71554d7f Replace pAI verb tab with an action button (#33358) 
pAI suicide is now standardized with other suicides. The Software
Interface verb has been changed to an action button. This eliminates the
need for a verb tab for only two verbs.
 2017-12-08 22:46:30 -06:00
deathride58
742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
deathride58
a8311d6adf Merge pull request #4263 from Citadel-Station-13/upstream-merge-33341 
[MIRROR] Fixes mugs being called "broken bottles"
 2017-12-08 20:24: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
4600a6eb87 Update drinks.dm 2017-12-08 14:07:33 -05:00
deathride58
e9932c4f40 Merge pull request #4277 from Citadel-Station-13/upstream-merge-33362 
[MIRROR] Fixes random in random seeds
 2017-12-08 18:53:15 +00:00