3802cf8586
Merge pull request #33805 from Cruix/shuttle_machines
...
Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
2017-12-30 13:56:43 -06:00
75f492f416
Always use the area name when selecting a teleport beacon
2017-12-30 13:55:17 -06:00
7c69a835be
Update teleporter.dm
2017-12-30 13:32:29 -06:00
47174097e1
Update communications.dm
2017-12-30 13:32:19 -06:00
a160997587
Update talisman.dm
2017-12-30 13:32:02 -06:00
a8d6fa7fd7
Update runes.dm
2017-12-30 13:31:51 -06:00
6c59d4134a
Update ritual.dm
2017-12-30 13:31:24 -06:00
f0214dd06d
Update overmind.dm
2017-12-30 13:31:13 -06:00
dae3c3efb5
Merge branch 'master' into upstream-merge-33621
2017-12-30 13:23:39 -06:00
8452cc74d0
Update newscaster.dm
2017-12-30 13:21:31 -06:00
b260704381
Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
...
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
cbb8d807f1
turfs changed to /space/basic are instead turned into /space
2017-12-30 13:14:04 -06:00
f860fa0cd3
Update closed.dm
2017-12-30 05:12:10 -06:00
19c6db6a6e
Merge pull request #4591 from Citadel-Station-13/upstream-merge-33905
...
[MIRROR] Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-30 05:06:03 -06:00
4599680f68
Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842
...
[MIRROR] Internal radio implant
2017-12-30 05:03:48 -06:00
2d9a70a487
Update uplink_kits.dm
2017-12-29 18:42:44 -06:00
a3ebaa5de8
Merge branch 'master' into upstream-merge-32311
2017-12-29 18:38:50 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
d38a4a2aa5
Merge pull request #33905 from ShizCalev/jumpsuit-fix
...
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-29 10:10:30 -06:00
a56882556b
Update _eminence.dm
2017-12-29 07:36:03 -06:00
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
e17f9fdc07
Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895
...
[MIRROR] Corrects abductor uncuffing message
2017-12-29 06:47:56 -06:00
80ce187d3d
Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873
...
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
2017-12-29 06:26:06 -06:00
0f328e22b2
Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558
...
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
2017-12-29 06:24:09 -06:00
b13d4dd721
Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807
...
[MIRROR] Made atoms not smooth with shuttles
2017-12-29 06:23:12 -06:00
f093bb8fec
Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856
...
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
2017-12-29 06:22:35 -06:00
bbaee9f3d7
Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880
...
[MIRROR] Fixes wall CanPass
2017-12-29 06:22:13 -06:00
c7db4e8310
also syncs a bunch of shit
2017-12-29 04:12:43 -06:00
6eabea6a71
Corrects abductor uncuffing message ( #33895 )
...
* Corrects abductor uncuffing message
* breaks
2017-12-29 02:56:30 -06:00
07ba4e8189
The Radiance (eminence after ratvar awakens) can now ignore chapel tiles ( #33873 )
2017-12-29 02:55:03 -06:00
866318e33e
Internal radio implant
2017-12-29 02:52:24 -06:00
518b264654
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
...
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
a9a94f7aed
Dead cultists can now cross Reebe's "Servant Blocker" ( #33558 )
...
* Dead Cultist Exception
* Servant blocker update
* Corpse balance
* Lets corpses pass servant blocker
* Lets cult corpses pass servant blocker
* Update servant_blocker.dm
* Update open.dm
* Update servant_blocker.dm
* Update open.dm
2017-12-29 00:29:19 -06:00
ab408d3e97
Made atoms not smooth with shuttles ( #33807 )
...
* Made atoms not smooth with shuttles
* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null
* Moved pirate shuttle areas into the multi-area shuttles section
2017-12-29 00:29:04 -06:00
6fac704a4f
Fixes AI eyes getting nullspaced when jumping to deleted cameras ( #33856 )
2017-12-29 00:28:47 -06:00
fbdf24ddd4
Fixes wall CanPass ( #33880 )
2017-12-29 00:28:32 -06:00
dc6b4e2b61
Christmas event changes ( #33861 )
...
* A christmas tree with presents is now a subtype
Admins can now spawn `/obj/structure/flora/tree/pine/xmas/presents`
directly, instead of spawning regular christmas trees and then
triggering the event.
Also, the event now just deletes and replaces the xmas tree with a
present tree; saves on duplication of icon states and vars and all that.
* Code review I
* Gaia's Landing: The PR
2017-12-29 00:28:02 -06:00
2ac9d9a171
Merge pull request #4554 from Citadel-Station-13/upstream-merge-33858
...
[MIRROR] Adds open/close sound to blastdoors and shutters
2017-12-28 23:57:40 -06:00
0147b4a7e1
Merge pull request #33853 from tgstation/Cyberboss-patch-2
...
If the world is launched with the "no-init" param. Master.Initialize isn't called
2017-12-27 23:59:21 -06:00
b8dc623ebc
Update poddoor.dm
2017-12-27 21:57:51 -05:00
aa83dbf500
Merge pull request #4532 from Citadel-Station-13/upstream-merge-33759
...
[MIRROR] Modified the starting locations of advanced camera console eyes
2017-12-28 02:54:18 +00:00
a8154d102a
Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777
...
[MIRROR] Arena shuttle teleport fix
2017-12-28 02:53:47 +00:00
b258879423
Merge pull request #4537 from Citadel-Station-13/upstream-merge-33828
...
[MIRROR] Revert "Vending TGUI"
2017-12-28 02:53:22 +00:00
269208f687
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
dbab8bbdab
Adds open/close sound to blastdoors and shutters
2017-12-27 10:50:17 -06:00
0381491643
oops
2017-12-27 07:08:26 -06:00
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
c84a8cc9e1
Merge pull request #4370 from Citadel-Station-13/upstream-merge-33504
...
[MIRROR] Saves newscaster data and photos to round logs folder
2017-12-27 04:46:04 -06:00
67ef791794
Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821
...
[MIRROR] Fixes deleting handcuffs
2017-12-27 03:05:33 -06:00
d33fe81662
Merge pull request #4536 from Citadel-Station-13/upstream-merge-33822
...
[MIRROR] Cut through handcuffs with power wirecutters
2017-12-27 03:05:21 -06:00
Jordan Brown