c7db4e8310
also syncs a bunch of shit
2017-12-29 04:12:43 -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
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
fa8b710fde
Automatic changelog generation for PR #4556 [ci skip]
2017-12-29 00:47:19 -06: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
55db5a5a8c
Merge pull request #4564 from Citadel-Station-13/upstream-merge-33861
...
[MIRROR] Christmas event changes
2017-12-29 06:44:44 +00:00
c018aa1f9f
Makes reset_perspective handle turf as eye
2017-12-29 00:28:18 -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
c425511111
Removes typepath from random event admin message
2017-12-29 00:28:10 -06:00
067680155f
Removes typepath from random event admin message
2017-12-29 00:28:10 -06:00
c621f669e8
Christmas event changes
2017-12-29 00:28:02 -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
0d79434b72
Automatic changelog generation for PR #4554 [ci skip]
2017-12-28 23:57:42 -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
6a84048518
Automatic changelog generation for PR #4563 [ci skip]
2017-12-28 23:50:03 -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
bfd0c7edfa
Merge pull request #4561 from Citadel-Station-13/upstream-merge-33853
...
[MIRROR] If the world is launched with the "no-init" param. Master.Initialize isn't called
2017-12-28 23:49:28 -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
311888361b
Fixes EMP runtime
2017-12-28 04:09:06 -06:00
0223fed7a3
Merge pull request #33868 from Robustin/EMPruntime
...
Fixes EMP runtime
2017-12-28 04:09:06 -06:00
19df2df07b
If the world is launched with the "no-init" param. Master.Initialize isn't called
2017-12-27 23:59:21 -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
f55cb8f9b3
Automatic changelog generation for PR #4531 [ci skip]
2017-12-27 20:53:49 -06: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
59c7a32e1a
Automatic changelog generation for PR #4538 [ci skip]
2017-12-27 20:52:47 -06: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
3e741abc89
Merge pull request #4541 from Citadel-Station-13/upstream-merge-33832
...
[MIRROR] Improve parts of CentCom's appearance slightly
2017-12-28 02:52:30 +00:00
d87c245227
Automatic changelog generation for PR #4549 [ci skip]
2017-12-27 20:52:11 -06: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
c52c7e9c6f
Automatic changelog generation for PR #4552 [ci skip]
2017-12-27 20:50:52 -06: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
aa8354c504
Merge pull request #4553 from Citadel-Station-13/upstream-merge-33850
...
[MIRROR] Radiation sign no longer has blood on it
2017-12-28 02:50:38 +00:00
29d46e985a
Merge pull request #4559 from Citadel-Station-13/upstream-merge-33888
...
[MIRROR] relic teleport no longer recursively calls itself
2017-12-28 02:50:11 +00:00
36d8ff1811
Update mob.dm
2017-12-27 21:48:18 -05:00
300a2cdf96
relic teleport no longer recursively calls itself
2017-12-27 19:32:26 -06: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
LetterJay