deathride58
11ecf4d922
Merge pull request #4066 from Citadel-Station-13/upstream-merge-32701
...
[MIRROR] Refactor chasm paths to be more sane
2017-11-22 19:40:55 +00:00
Shadowlight213
06b86e54b3
Adds round ID to status topic ( #32976 )
2017-11-22 12:41:44 -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
deathride58
dc0128a6d3
Merge pull request #4058 from Citadel-Station-13/upstream-merge-32954
...
[MIRROR] Fixes blobbernaut spawning
2017-11-22 06:00:58 +00:00
jammer312
cf10130b21
Conjuration spells fix ( #32951 )
...
* conjure spells fix
* added newline at end of file
2017-11-21 22:30:05 -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
deathride58
0f9a85e4d7
Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
...
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00: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
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
deathride58
c2b27ebfa4
merges #3837
2017-11-21 14:45:44 -05:00
deathride58
9f80325c52
Update power.dm
2017-11-21 14:20:03 -05:00
deathride58
e5cdbe29cc
Update printer.dm
2017-11-21 14:18:42 -05:00
deathride58
232be3da9f
Merge pull request #4052 from Citadel-Station-13/upstream-merge-32928
...
[MIRROR] Fixes humans missing legs moving slower in zero-g enviroments
2017-11-21 19:15:41 +00:00
deathride58
ddbb5c34d4
manual mirrors
2017-11-21 14:06:28 -05:00
Leo
f668f36156
Merge pull request #32928 from ShizCalev/space-leg-slowdown
...
Fixes humans missing legs moving slower in zero-g enviroments
2017-11-21 04:01:56 -06:00
ACCount
8a64287249
Integrated circuit fixes and code improvements
2017-11-21 03:04:17 -06:00
ShizCalev
35af5e49aa
Fixes computers deleting on build ( #32942 )
...
* Fixes computers deleting on build
* Removed src
2017-11-21 02:43:34 -06:00
deathride58
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
deathride58
2e210d08e1
Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING
...
[READY] Redtext bug fix + Endround objective check cleanup
2017-11-21 05:53:00 +00:00
deathride58
fc5badc8e3
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
2017-11-20 23:50:52 -05:00
deathride58
2abd06e25e
Merge pull request #4028 from Citadel-Station-13/upstream-merge-32862
...
[MIRROR] Rat Kebabs
2017-11-21 04:39:41 +00: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
0ed8bf3237
Update security_levels.dm
2017-11-20 22:33:12 -05:00
deathride58
3b0a71006c
Update experimentor.dm
2017-11-20 22:32:20 -05:00
deathride58
15165d970d
Update inventory.dm
2017-11-20 22:29:55 -05:00
deathride58
3aefa4a907
Update cameranet.dm
2017-11-20 22:29:15 -05:00
deathride58
1dddcb5d83
Update beesease.dm
2017-11-20 22:28:29 -05:00
deathride58
d09be2a59a
Update byjax.dm
2017-11-20 22:27:58 -05:00
deathride58
6b8d256c21
Merge pull request #4030 from Citadel-Station-13/upstream-merge-32885
...
[MIRROR] tweak skateboard crashes, gives brain damage
2017-11-21 03:27:16 +00:00
deathride58
b284385b20
Merge pull request #4042 from Citadel-Station-13/upstream-merge-32908
...
[MIRROR] Fixes the RD being able to kill the bar drone with his console
2017-11-21 03:26:26 +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
AnturK
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
KorPhaeron
8242b08d28
Bar Drone can't be remotely detonated ( #32908 )
2017-11-20 13:40:23 -06:00
deathride58
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
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
34b7c7da81
Merge pull request #4031 from Citadel-Station-13/upstream-merge-32797
...
[MIRROR] Refactor ladders so that they actually work
2017-11-20 19:06:30 +00:00
deathride58
ddd024239a
Merge pull request #4035 from Citadel-Station-13/upstream-merge-32892
...
[MIRROR] Fixes two bugs in disposals
2017-11-20 19:05:23 +00:00
deathride58
588b76b59e
Update lootdrop.dm
2017-11-20 13:57:15 -05:00
deathride58
f9b5c04cd3
Update buildandrepair.dm
2017-11-20 13:45:39 -05:00
deathride58
8cbd704988
Update footprints_and_rag.dm
2017-11-20 13:43:48 -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
Jordan Brown
298035b339
Merge pull request #32900 from AnturK/actuallyfixesthatthing
...
Fixes lobby timer on setup failure
2017-11-20 10:11:04 -06:00
ShizCalev
aea13f75cd
Allows rotating computer frames, fixes rotation on deconstruction, switches dropped materials to use drop_location()
2017-11-20 03:08:10 -06:00
ACCount
0fa731cec0
Fixes two refactor-caused bugs in disposals ( #32892 )
2017-11-20 02:47:35 -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
checkraisefold
080aa1750e
tweak skateboard crashes, gives brain damage ( #32885 )
...
* tweak skateboard crashes
* helmet stops brain damage
* add hardhat
2017-11-20 01:50:24 -06:00
