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
d9c650970c
making prs isn't even worth it anymore ( #33056 )
2017-11-24 22:36:22 -06:00
d52d546463
Deny buckling when the user is inside lockers, mechs, etc. ( #33015 )
2017-11-24 22:29:40 -06:00
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
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
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
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
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
d04bbbdd67
Update step_triggers.dm
2017-11-24 17:59:18 -05:00
7b2a926235
Update bump_teleporter.dm
2017-11-24 17:58:29 -05:00
c43dc3ab7a
Update Space_Station_13_areas.dm
2017-11-24 17:39:59 -05:00
521277292d
Revises the_station_areas list
2017-11-24 14:12:53 -06:00
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
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
dc0310eb5d
Adds a config to optionally hard reboot DD ( #33006 )
2017-11-24 13:00:02 -06:00
9806de310d
Remove NODROP from water tank misters ( #32995 )
2017-11-24 12:59:25 -06:00
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
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
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
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
435ac739fc
Update machine_circuitboards.dm
2017-11-22 20:09:18 -05:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
c2c22d56c7
[READY]NTnet refactor, assimilates exonet
2017-11-22 15:52:54 -06:00
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
d86bdf2150
Update trash.dm
2017-11-22 14:44:09 -05:00
64c7fa0cfd
Simple wall turret buff ( #32937 )
...
* Simple wall turret buff
* Adds mapper support
2017-11-22 12:44:59 -06:00
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
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
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
51a7c4a543
Merge pull request #4057 from deathride58/manualmirrors2
...
Manually mirrors #32838 and #32462 from upstream
2017-11-21 20:00:18 +00:00
4b284f2e0d
Merge pull request #4051 from Citadel-Station-13/upstream-merge-32773
...
[MIRROR] Integrated circuit fixes and code improvements
2017-11-21 19:59:38 +00:00
0feca054da
cleans up whitespace in traitor_bro.dm
2017-11-21 14:58:43 -05:00
973be1b494
Update traitor_bro.dm
2017-11-21 14:56:41 -05:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
ddbb5c34d4
manual mirrors
2017-11-21 14:06:28 -05:00
8a64287249
Integrated circuit fixes and code improvements
2017-11-21 03:04:17 -06:00
35af5e49aa
Fixes computers deleting on build ( #32942 )
...
* Fixes computers deleting on build
* Removed src
2017-11-21 02:43:34 -06:00
c1b344f08f
Merge pull request #4049 from Citadel-Station-13/upstream-merge-32860
...
[MIRROR] Cleans up floors.dmi a bit and adds new turf decals.
2017-11-21 06:42:22 +00:00
2e210d08e1
Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING
...
[READY] Redtext bug fix + Endround objective check cleanup
2017-11-21 05:53:00 +00:00
4e727ee576
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
...
# Conflicts:
# _maps/map_files/MetaStation/MetaStation.dmm
2017-11-20 23:34:46 -05:00
d2b251d23c
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
...
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
8249c89cc0
Merge pull request #4040 from Citadel-Station-13/upstream-merge-32905
...
[MIRROR] Adds AI lawset spawners (mapping helpers)
2017-11-21 03:25:55 +00:00
e8ddae5d98
Cleans up floors.dmi a bit and adds new turf decals.
2017-11-20 20:48:06 -06:00
70c7996986
Fixes abductor teams getting assigned to same pod ( #32859 )
...
* Fixes abductors getting assigned to same team
* Remove explicit null return
2017-11-20 19:36:10 -06:00
05fbbaf867
Merge pull request #4036 from Citadel-Station-13/upstream-merge-32877
...
[MIRROR] Allows rotating computer frames, fixes rotation on deconstruction, switches dropped materials to use drop_location()
2017-11-20 19:08:13 +00:00
a5ed407bc5
Merge pull request #4034 from Citadel-Station-13/upstream-merge-32890
...
[MIRROR] Makes drinking glasses smash when thrown
2017-11-20 19:07:25 +00:00
588b76b59e
Update lootdrop.dm
2017-11-20 13:57:15 -05:00
f9b5c04cd3
Update buildandrepair.dm
2017-11-20 13:45:39 -05:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
deathride58