deathride58
c8022e2764
Merge pull request #4145 from Citadel-Station-13/upstream-merge-33099
...
[MIRROR] Allows toolbelts to carry geiger counters
2017-11-27 20:39:35 +00:00
Leo
5b45f66677
Merge pull request #33099 from jughu/Powercreep-till-the-end
...
Allows toolbelts to carry geiger counters
2017-11-27 08:20:18 -06:00
uraniummeltdown
2d0f8d9482
Stack Recipe Lists ( #33081 )
...
* ports baycode stack_recipe_list
comfy and office chairs use stack recipe lists
* removed some src. and made list_recipes() into interact()
* /datum/browser for stack menus
* revert unnecessary edit
2017-11-27 06:17:18 -06:00
deathride58
9e0aac69f3
Merge pull request #4136 from Citadel-Station-13/upstream-merge-33034
...
[MIRROR] More integrated circuit fixes and code improvements
2017-11-27 05:17:50 +00:00
deathride58
1d8618eaca
Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090
...
[MIRROR] Cleans up goldcore defines
2017-11-27 03:11:42 +00:00
deathride58
c4b3b99c99
Merge pull request #4141 from Citadel-Station-13/upstream-merge-33087
...
[MIRROR] Cleans up some qdel(src)'s in Initialize()
2017-11-27 02:37:07 +00:00
deathride58
c9211bca16
Update multitool.dm
2017-11-26 21:36:10 -05:00
deathride58
9538aa645c
Update bombspawner.dm
2017-11-26 21:20:00 -05:00
ShizCalev
5abd1bcdd9
Cleans up some qdel(src)'s in Initialize()
2017-11-26 20:15:18 -06:00
AnturK
c574b06f90
Fixes wizard greentext ( #33088 )
2017-11-26 16:53:58 -06:00
ShizCalev
4a22fed89d
Cleans up goldcore defines
2017-11-26 16:51:44 -06:00
ACCount
0be326633d
More integrated circuit fixes and code improvements
2017-11-26 04:56:44 -06:00
deathride58
be89f4d7dd
Merge pull request #4116 from Citadel-Station-13/upstream-merge-32940
...
[MIRROR] Advanced Laserpointer Feline Interaction
2017-11-26 02:18:56 +00:00
deathride58
b32f24113a
Merge pull request #4131 from Citadel-Station-13/upstream-merge-33075
...
[MIRROR] Adds spawn override system
2017-11-26 02:18:24 +00:00
Jordan Brown
20014e6f44
Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants
...
Adds spawn override system
2017-11-25 16:37:46 -06:00
WJohn
237f0fa8db
Lowers rack layer to 2.8 ( #33069 )
2017-11-25 09:21:02 -06:00
deathride58
14ce7c8118
Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
...
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
deathride58
abc62818d3
Merge pull request #4120 from Citadel-Station-13/upstream-merge-33056
...
[MIRROR] robotics console desc change
2017-11-25 05:49:07 +00:00
Armhulen
d9c650970c
making prs isn't even worth it anymore ( #33056 )
2017-11-24 22:36:22 -06:00
Tad Hardesty
d52d546463
Deny buckling when the user is inside lockers, mechs, etc. ( #33015 )
2017-11-24 22:29:40 -06:00
deathride58
186bcf6ef4
Update laserpointer.dm
2017-11-24 19:03:25 -05:00
Dorsisdwarf
6dea43c709
Advanced Laserpointer Feline Interaction
2017-11-24 17:56:58 -06:00
deathride58
ff94b3e1e1
Merge pull request #4113 from Citadel-Station-13/upstream-merge-32998
...
[MIRROR] Revises the_station_areas list
2017-11-24 23:47:34 +00:00
deathride58
f92bc0c938
Merge pull request #4098 from Citadel-Station-13/upstream-merge-32805
...
[MIRROR] Refactor on_reagent_change to pass through the change type
2017-11-24 23:47:13 +00:00
deathride58
837779b683
Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025
...
[MIRROR] Fixes Lord Singuloth hungering for more than he should
2017-11-24 23:15:09 +00:00
deathride58
7125a50340
Merge pull request #4104 from Citadel-Station-13/upstream-merge-33006
...
[MIRROR] Adds a config to optionally hard reboot DD
2017-11-24 23:12:45 +00:00
deathride58
a591fb6019
Merge pull request #4100 from Citadel-Station-13/upstream-merge-32995
...
[MIRROR] Remove NODROP from water tank misters
2017-11-24 23:00:04 +00:00
deathride58
d04bbbdd67
Update step_triggers.dm
2017-11-24 17:59:18 -05:00
deathride58
7b2a926235
Update bump_teleporter.dm
2017-11-24 17:58:29 -05:00
deathride58
c43dc3ab7a
Update Space_Station_13_areas.dm
2017-11-24 17:39:59 -05:00
Leo
521277292d
Revises the_station_areas list
2017-11-24 14:12:53 -06:00
Leo
541b8db684
Merge pull request #32985 from YPOQ/airlockfix
...
Fixes AIs being unable to interact with unscrewed airlocks
2017-11-24 14:11:39 -06:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
Jordan Brown
dc0310eb5d
Adds a config to optionally hard reboot DD ( #33006 )
2017-11-24 13:00:02 -06:00
ShizCalev
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
Tad Hardesty
9806de310d
Remove NODROP from water tank misters ( #32995 )
2017-11-24 12:59:25 -06:00
oranges
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
ACCount
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
deathride58
f83ce9cd11
Merge pull request #4073 from Citadel-Station-13/upstream-merge-32937
...
[MIRROR] Simple wall turret buff
2017-11-24 00:19:24 +00:00
Jordan Brown
8943bf0184
Merge pull request #33041 from MrStonedOne/patch-452
...
Lowers the stress the dna console puts on the string tree
2017-11-23 12:07:17 -06:00
deathride58
c76cacdf77
Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914
...
[MIRROR] [READY]NTnet refactor, assimilates exonet
2017-11-23 01:40:54 +00:00
deathride58
435ac739fc
Update machine_circuitboards.dm
2017-11-22 20:09:18 -05:00
LetterJay
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
oranges
c2c22d56c7
[READY]NTnet refactor, assimilates exonet
2017-11-22 15:52:54 -06:00
deathride58
2e9f3bc1c0
Merge pull request #4071 from Citadel-Station-13/upstream-merge-32968
...
[MIRROR] Fixes bartender suit having an adjust state
2017-11-22 20:50:45 +00:00
deathride58
d86bdf2150
Update trash.dm
2017-11-22 14:44:09 -05:00
AnturK
64c7fa0cfd
Simple wall turret buff ( #32937 )
...
* Simple wall turret buff
* Adds mapper support
2017-11-22 12:44:59 -06:00
ShizCalev
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
Tad Hardesty
38c45fb479
Refactor chasm paths to be more sane ( #32701 )
...
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.
Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 03:30:49 -06:00
KorPhaeron
ddddac262e
Fixes blobbernaut spawning ( #32954 )
...
* Fixes blobbernaut spawning
* There is no mob yet, we can't poll for it
2017-11-21 22:27:49 -06:00
