LetterJay
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
LetterJay
93914f2a31
Merge pull request #4571 from Citadel-Station-13/upstream-merge-33902
...
[MIRROR] Fixes admin fingerprintslast
2017-12-29 06:23:01 -06:00
LetterJay
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
LetterJay
3c204c0125
Merge pull request #4569 from Citadel-Station-13/upstream-merge-33867
...
[MIRROR] Fixes ethanol + book reaction message
2017-12-29 06:22:26 -06:00
LetterJay
bbaee9f3d7
Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880
...
[MIRROR] Fixes wall CanPass
2017-12-29 06:22:13 -06:00
deathride58
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
deathride58
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
deathride58
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
Cruix
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
oranges
4e1770a21f
Fixes admin fingerprintslast
2017-12-29 00:28:55 -06:00
YPOQ
6fac704a4f
Fixes AI eyes getting nullspaced when jumping to deleted cameras ( #33856 )
2017-12-29 00:28:47 -06:00
Robustin
4157c30fd8
Fixes ethanol + book reaction message ( #33867 )
2017-12-29 00:28:40 -06:00
AnturK
fbdf24ddd4
Fixes wall CanPass ( #33880 )
2017-12-29 00:28:32 -06:00
Leo
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
Jordan Brown
067680155f
Removes typepath from random event admin message
2017-12-29 00:28:10 -06:00
coiax
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
LetterJay
b3793ee6d4
Update living.dm
2017-12-28 23:58:07 -06:00
LetterJay
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
LetterJay
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
LetterJay
98e8e4bbbf
Merge pull request #4562 from Citadel-Station-13/upstream-merge-33868
...
[MIRROR] Fixes EMP runtime
2017-12-28 23:49:45 -06:00
deathride58
3df98e631b
Fixes compiling errors
2017-12-28 16:13:30 -05:00
deathride58
2fdb9e598f
Modularizes dogborgs, adds new alternate skins for some modules, and more!
2017-12-28 15:50:33 -05:00
oranges
0223fed7a3
Merge pull request #33868 from Robustin/EMPruntime
...
Fixes EMP runtime
2017-12-28 04:09:06 -06:00
oranges
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
deathride58
90582d2e1a
Merge pull request #4557 from Citadel-Station-13/upstream-merge-33831
...
[MIRROR] adds handholding
2017-12-28 02:59:56 +00:00
deathride58
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
deathride58
b8dc623ebc
Update poddoor.dm
2017-12-27 21:57:51 -05:00
deathride58
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
deathride58
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
deathride58
b258879423
Merge pull request #4537 from Citadel-Station-13/upstream-merge-33828
...
[MIRROR] Revert "Vending TGUI"
2017-12-28 02:53:22 +00:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
36d8ff1811
Update mob.dm
2017-12-27 21:48:18 -05:00
Jordan Brown
df080960d4
Merge pull request #33888 from optimumtact/dothefandangomistersantiago
...
relic teleport no longer recursively calls itself
2017-12-27 19:32:26 -06:00
kevinz000
c8788ed4f7
adds handholding
2017-12-27 16:20:44 -06:00
kevinz000
bf7838aded
[READY]Adds picking up corgis and pAIs!
2017-12-27 15:47:57 -06:00
Jordan Brown
dbab8bbdab
Adds open/close sound to blastdoors and shutters
2017-12-27 10:50:17 -06:00
Robustin
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
LetterJay
a034383e15
Merge pull request #4449 from Citadel-Station-13/upstream-merge-33627
...
[MIRROR] dock() re-organization
2017-12-27 07:01:40 -06:00
LetterJay
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
LetterJay
e2d2c8cda0
Merge branch 'master' into upstream-merge-33627
2017-12-27 04:41:27 -06:00
LetterJay
2b77dda3e9
Merge pull request #4534 from Citadel-Station-13/upstream-merge-33780
...
[MIRROR] Blocks auxiliary bases from being placed on top of lava or indestructible turfs
2017-12-27 03:05:48 -06:00
LetterJay
67ef791794
Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821
...
[MIRROR] Fixes deleting handcuffs
2017-12-27 03:05:33 -06:00
LetterJay
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
LetterJay
bb9e223b7d
Merge pull request #4551 from Citadel-Station-13/upstream-merge-33749
...
[MIRROR] Maybe make R&D console icons load faster
2017-12-27 03:04:42 -06:00
LetterJay
0b2e6562af
Merge pull request #4550 from Citadel-Station-13/upstream-merge-33770
...
[MIRROR] adds ABSTRACT_1 flag to internal magazine objects
2017-12-27 03:04:17 -06:00
LetterJay
6926e94bf8
Merge pull request #4548 from Citadel-Station-13/upstream-merge-33782
...
[MIRROR] Fixed shuttle docking computers not working more than once
2017-12-27 03:03:33 -06:00
LetterJay
11ca5afc92
Merge pull request #4546 from Citadel-Station-13/upstream-merge-33834
...
[MIRROR] Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
2017-12-27 03:03:16 -06:00
