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
1047dccdd5
fk
2017-12-29 01:20:09 -06:00
96543b5e63
Merge pull request #4566 from Citadel-Station-13/upstream-merge-33881
...
[MIRROR] Makes reset_perspective handle turf as eye
2017-12-29 06:48:10 +00:00
b03a8a70db
Merge pull request #4556 from Citadel-Station-13/upstream-merge-33442
...
[MIRROR] [READY]Adds picking up corgis and pAIs!
2017-12-29 06:47:17 +00:00
bc6df43cd0
Merge pull request #4565 from Citadel-Station-13/upstream-merge-33879
...
[MIRROR] Removes typepath from random event admin message
2017-12-29 06:45:22 +00:00
ad59b058ad
Merge pull request #33876 from AnturK/roundend_feedback_standard
...
Cleans up survivor counting tiny bit
2017-12-29 00:29:49 -06:00
6ce76e38d4
CTF flags are no longer locked to CTF. ( #33874 )
...
* CTF flags are no longer locked to CTF.
* Var added to enable/disable pickup by anybody.
2017-12-29 00:29:42 -06:00
fa7d2a4790
Makes default admin volume work again. ( #33875 )
2017-12-29 00:29:35 -06:00
77f9295df2
Fixes ghost light not moving while orbiting ( #33878 )
2017-12-29 00:29:27 -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
ccdccb57af
Adds roundend nuke disk location tracking to feedback.
2017-12-29 00:29:12 -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
4e1770a21f
Fixes admin fingerprintslast
2017-12-29 00:28:55 -06:00
6fac704a4f
Fixes AI eyes getting nullspaced when jumping to deleted cameras ( #33856 )
2017-12-29 00:28:47 -06:00
4157c30fd8
Fixes ethanol + book reaction message ( #33867 )
2017-12-29 00:28:40 -06:00
fbdf24ddd4
Fixes wall CanPass ( #33880 )
2017-12-29 00:28:32 -06:00
868fbec32d
Merge pull request #33881 from AnturK/walls-have-eyes
...
Makes reset_perspective handle turf as eye
2017-12-29 00:28:18 -06:00
067680155f
Removes typepath from random event admin message
2017-12-29 00:28:10 -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
8a792d6ef6
more save points
2017-12-29 00:07:36 -06:00
b3793ee6d4
Update living.dm
2017-12-28 23:58:07 -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
40859e3c0a
Merge pull request #4563 from deathride58/anthromedibots
...
[READY] Adds a new alternate sprite for mediborgs from Paradise (with modifications from Vivi) and more!
2017-12-28 23:50:00 -06:00
98e8e4bbbf
Merge pull request #4562 from Citadel-Station-13/upstream-merge-33868
...
[MIRROR] Fixes EMP runtime
2017-12-28 23:49:45 -06:00
3df98e631b
Fixes compiling errors
2017-12-28 16:13:30 -05:00
2fdb9e598f
Modularizes dogborgs, adds new alternate skins for some modules, and more!
2017-12-28 15:50:33 -05:00
0223fed7a3
Merge pull request #33868 from Robustin/EMPruntime
...
Fixes EMP runtime
2017-12-28 04:09:06 -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
90582d2e1a
Merge pull request #4557 from Citadel-Station-13/upstream-merge-33831
...
[MIRROR] adds handholding
2017-12-28 02:59:56 +00:00
df14e129f4
Merge pull request #4528 from Citadel-Station-13/upstream-merge-33708
...
[MIRROR] Adds random seed feedback
2017-12-28 02:59:01 +00: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
754d3d9b28
Merge pull request #4539 from Citadel-Station-13/upstream-merge-33840
...
[MIRROR] Logs traumas in the feedback database
2017-12-28 02:53:01 +00:00
0f3e69a420
Merge pull request #4538 from Citadel-Station-13/upstream-merge-33820
...
[MIRROR] Material containers only insert on help intent
2017-12-28 02:52:45 +00:00
c286dfcefb
Merge pull request #4549 from Citadel-Station-13/upstream-merge-33833
...
[MIRROR] Fixes ghost zoom being broken
2017-12-28 02:52:08 +00:00
ca285046b0
Merge pull request #4552 from Citadel-Station-13/upstream-merge-33859
...
[MIRROR] Hallucinations no longer show open doors "bolting"
2017-12-28 02:50:50 +00:00
36d8ff1811
Update mob.dm
2017-12-27 21:48:18 -05:00
df080960d4
Merge pull request #33888 from optimumtact/dothefandangomistersantiago
...
relic teleport no longer recursively calls itself
2017-12-27 19:32:26 -06:00
c8788ed4f7
adds handholding
2017-12-27 16:20:44 -06:00
bf7838aded
[READY]Adds picking up corgis and pAIs!
2017-12-27 15:47:57 -06: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
4a93756e6b
Hallucinations no longer show open doors "bolting" ( #33859 )
...
* No more "bolting" open doors
* Update Hallucination.dm
* Update Hallucination.dm
2017-12-27 08:26:16 -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
a034383e15
Merge pull request #4449 from Citadel-Station-13/upstream-merge-33627
...
[MIRROR] dock() re-organization
2017-12-27 07:01: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
e2d2c8cda0
Merge branch 'master' into upstream-merge-33627
2017-12-27 04:41:27 -06:00
LetterJay