LetterJay
6217206bae
Merge pull request #4189 from Citadel-Station-13/upstream-merge-33180
...
[MIRROR] cardboard no longer can damage you
2017-12-03 06:16:00 -06:00
LetterJay
c5f0b380cd
Merge pull request #4186 from Citadel-Station-13/upstream-merge-33157
...
[MIRROR] Clean up some loc assignments
2017-12-03 06:14:34 -06:00
Leo
4723a1813b
Merge pull request #33180 from praisenarsie/patch-13
...
cardboard no longer can damage you
2017-12-02 09:44:47 -06:00
vuonojenmustaturska
9f9582ba5e
Clean up some loc assignments ( #33157 )
2017-12-02 09:44:20 -06:00
Robustin
786c26fa97
Ratvar will now bitchslap BOH babies ( #33159 )
...
* Singuloproofing Reebe
* Message reformatted
* Inconsistent Indentification
* user is now living so we can knock them down
2017-12-01 11:58:30 -06:00
deathride58
32f694943b
Merge pull request #4150 from Citadel-Station-13/upstream-merge-32965
...
[MIRROR] Removes mass-spectrometers
2017-11-30 04:45:13 +00:00
deathride58
9458087cfa
Update scanners.dm
2017-11-28 22:31:54 -05:00
deathride58
6c6149e1af
Merge pull request #4164 from Citadel-Station-13/upstream-merge-33127
...
[MIRROR] Fixes twohanded weapons showing outdated icons when equipped to the back
2017-11-29 03:29:17 +00:00
ShizCalev
47e0943c9c
Fixes twohanded weapons showing outdated icons ( #33127 )
2017-11-28 19:04:09 -06:00
ShizCalev
48c66093fc
Fixes big band music crate ( #33138 )
2017-11-28 19:02:54 -06:00
ACCount
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
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
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
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
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
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
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
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -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
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
d86bdf2150
Update trash.dm
2017-11-22 14:44:09 -05:00
ShizCalev
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
deathride58
51a7c4a543
Merge pull request #4057 from deathride58/manualmirrors2
...
Manually mirrors #32838 and #32462 from upstream
2017-11-21 20:00:18 +00:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
deathride58
ddbb5c34d4
manual mirrors
2017-11-21 14:06:28 -05:00
ACCount
8a64287249
Integrated circuit fixes and code improvements
2017-11-21 03:04:17 -06:00
deathride58
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
deathride58
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
deathride58
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
WJohn
e8ddae5d98
Cleans up floors.dmi a bit and adds new turf decals.
2017-11-20 20:48:06 -06:00
