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 |
|
deathride58
|
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 |
|
deathride58
|
588b76b59e
|
Update lootdrop.dm
|
2017-11-20 13:57:15 -05:00 |
|
Jordan Brown
|
2498e1ddc0
|
Cleans up unused code
|
2017-11-20 10:14:32 -06:00 |
|
Jordan Brown
|
212071e075
|
Adds AI lawset spawners (mapping helpers)
|
2017-11-20 10:12:17 -06:00 |
|
ShizCalev
|
831dde525e
|
Makes drinking glasses smash when thrown
|
2017-11-20 02:45:22 -06:00 |
|
Tad Hardesty
|
5560a557e7
|
Refactor ladders so that they actually work (#32797)
|
2017-11-20 02:05:52 -06:00 |
|
deathride58
|
44287392a4
|
Merge pull request #4022 from Citadel-Station-13/upstream-merge-32889
[MIRROR] Makes some turning procs consistently turn clockwise
|
2017-11-20 05:48:20 +00:00 |
|
deathride58
|
994b55c523
|
Merge pull request #4027 from Citadel-Station-13/upstream-merge-32864
[MIRROR] Fixes some computer dirs
|
2017-11-20 05:09:43 +00:00 |
|
deathride58
|
dccd2b6744
|
Merge pull request #4026 from Citadel-Station-13/upstream-merge-32880
[MIRROR] Fixes vehicles & chameleon projector
|
2017-11-20 05:09:08 +00:00 |
|
Jordie
|
571985ca5d
|
Merge pull request #32864 from ike709/dir
Fixes some computer dirs
|
2017-11-19 22:42:28 -06:00 |
|
Jordie
|
2bf7b45919
|
Merge pull request #32880 from vuonojenmustaturska/chameleonprojfix
Fixes vehicles & chameleon projector
|
2017-11-19 22:39:14 -06:00 |
|
Jordie
|
752bc654ae
|
Makes some turning procs consistently turn clockwise
|
2017-11-19 22:25:17 -06:00 |
|
oranges
|
326c87904a
|
Merge pull request #32876 from vuonojenmustaturska/glowshrooms
Actually fixes the glowshroom runtime
|
2017-11-19 21:24:51 -06:00 |
|
deathride58
|
1d841ce65a
|
Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
[MIRROR] RPD ui improvements
|
2017-11-18 05:40:13 +00:00 |
|
deathride58
|
eeba86e27e
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-18 05:31:42 +00:00 |
|
deathride58
|
9e78bcd8f9
|
Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
|
2017-11-18 05:29:32 +00:00 |
|
deathride58
|
38f7b829c3
|
Update manifest.dm
|
2017-11-17 23:20:44 -05:00 |
|
duncathan salt
|
52fc5e8bc6
|
RPD ui improvements
|
2017-11-17 18:03:56 -06:00 |
|
oranges
|
a637da3b0f
|
Add the ability to osay from the viewvar dropdown (#32804)
|
2017-11-17 03:49:08 -06:00 |
|