Commit Graph

4296 Commits

Author SHA1 Message Date
LetterJay
a921dcd568 Merge pull request #3064 from Citadel-Station-13/upstream-merge-31177
[MIRROR] Ashwalker tendrils now drop everything on victims before consuming
2017-10-01 23:39:48 -04:00
LetterJay
ea493d3f3d Merge pull request #3063 from Citadel-Station-13/upstream-merge-31175
[MIRROR] Fixes viruses not calling Start on their symptoms when spreading
2017-10-01 23:39:41 -04:00
LetterJay
2cafd6fefb Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086
[MIRROR] Adds desc to things lacking them.
2017-10-01 23:37:35 -04:00
LetterJay
fc89d769f0 Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130
[MIRROR] Adds the Cargo-Tech-of-the-Shift award
2017-10-01 23:37:26 -04:00
LetterJay
a468f609d8 Merge pull request #3054 from Citadel-Station-13/upstream-merge-31163
[MIRROR] Fixes recyclers removing brainmobs from holders, removes direct loc setting and src.loc in playsound too
2017-10-01 23:37:09 -04:00
LetterJay
cc8f494f1f Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129
[MIRROR] Cleans up some antag/event landmark checks
2017-10-01 23:36:48 -04:00
LetterJay
05022208e3 Merge pull request #3067 from Citadel-Station-13/upstream-merge-31213
[MIRROR] Revert "Prompt for observer confirmation now happens when you click it initially"
2017-10-01 20:48:09 -04:00
LetterJay
64ced3f6f4 Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114
[MIRROR] Fixes space vision
2017-10-01 16:56:24 -04:00
LetterJay
1ecebee19d Merge pull request #3057 from Citadel-Station-13/upstream-merge-31171
[MIRROR] Lastest
2017-10-01 16:55:54 -04:00
LetterJay
39741c4706 Merge pull request #3059 from Citadel-Station-13/upstream-merge-31082
[MIRROR] Repairs and Intensifies Secret Satchels
2017-10-01 16:55:18 -04:00
oranges
e2dd424fb0 Revert "Prompt for observer confirmation now happens when you click it initially" 2017-10-01 15:50:27 -05:00
LetterJay
353739071f Update lib_items.dm 2017-10-01 15:46:53 -05:00
LetterJay
76d6402a9d Update windoor_assembly.dm 2017-10-01 15:46:31 -05:00
LetterJay
4a4ecdf211 Update transit_tube_construction.dm 2017-10-01 15:46:20 -05:00
LetterJay
0480bebc8b Merge pull request #3058 from Citadel-Station-13/upstream-merge-31167
[MIRROR] Prompt for observer confirmation now happens when you click it initially
2017-10-01 16:38:27 -04:00
LetterJay
1c00a8ba29 Update recycler.dm 2017-10-01 15:38:09 -05:00
LetterJay
77bdebd020 Merge pull request #3053 from Citadel-Station-13/upstream-merge-31155
[MIRROR] Fixes station name in cargo stock displays
2017-10-01 16:37:31 -04:00
LetterJay
cef0d9ef68 Merge pull request #3052 from Citadel-Station-13/upstream-merge-31165
[MIRROR] fixes delete hotkey triggering messages when the user isn't even a living mob
2017-10-01 16:35:53 -04:00
LetterJay
f3ae038f6c Update cargo.dm 2017-10-01 15:35:27 -05:00
LetterJay
5b81614e87 Merge pull request #3051 from Citadel-Station-13/upstream-merge-31200
[MIRROR] Fixes warning spam
2017-10-01 16:32:46 -04:00
LetterJay
018300507a Merge pull request #3050 from Citadel-Station-13/upstream-merge-31162
[MIRROR] Fixes plasma cutters only hitting one tile
2017-10-01 16:32:24 -04:00
LetterJay
0e50bc7884 Merge pull request #3049 from Citadel-Station-13/upstream-merge-31203
[MIRROR] Fixes paper writing
2017-10-01 16:32:12 -04:00
LetterJay
c8647565fc Merge pull request #3048 from Citadel-Station-13/upstream-merge-31157
[MIRROR] Fixes events with sleeps.
2017-10-01 16:32:00 -04:00
LetterJay
f538d91fe8 Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145
[MIRROR] Fixes aliums being able to attack the SM crystal
2017-10-01 16:31:44 -04:00
LetterJay
f0379ec3f3 Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
2017-10-01 16:30:40 -04:00
LetterJay
3d2b5e99c9 Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143
[MIRROR] adds a space
2017-10-01 16:29:35 -04:00
LetterJay
8b0b4f9e2a Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132
[MIRROR] Fixes changelings being able to transform sting mobs that are transform sting immune
2017-10-01 16:29:13 -04:00
LetterJay
2d8e3b301f Merge pull request #3037 from Citadel-Station-13/upstream-merge-31128
[MIRROR] Removes irccheck admin restriction
2017-10-01 16:29:04 -04:00
LetterJay
676abb946c Update halloween.dm 2017-10-01 15:26:56 -05:00
LetterJay
f1f99fc26c Update electrical_storm.dm 2017-10-01 15:26:32 -05:00
LetterJay
00aa312610 Update carp_migration.dm 2017-10-01 15:26:15 -05:00
kevinz000
4274a875db Ashwalker tendrils now drop everything on victims before consuming (#31177)
* Update ash_walker_den.dm

* Update ash_walker_den.dm
2017-10-01 15:22:26 -05:00
XDTM
d274843958 Fixes viruses not calling Start on their symptoms when spreading 2017-10-01 15:22:19 -05:00
LetterJay
1057b4b636 Merge pull request #3035 from Citadel-Station-13/upstream-merge-31137
[MIRROR] Fixes meteors not working with multi z
2017-10-01 16:21:08 -04:00
LetterJay
e572d2e529 Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
oranges
d701230090 Merge pull request #31114 from AnturK/spacevision
Fixes space vision
2017-10-01 15:15:54 -05:00
bawhoppen
82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
oranges
48212ee000 Merge pull request #31082 from Incoming5643/Satchel_Fix
Repairs and Intensifies Secret Satchels
2017-10-01 15:02:23 -05:00
LetterJay
b2a01d688d Merge pull request #3044 from Citadel-Station-13/upstream-merge-31136
[MIRROR] Adds a single comment to is_helpers.dm
2017-10-01 15:56:43 -04:00
LetterJay
21302e3fdc Merge pull request #3032 from Citadel-Station-13/upstream-merge-31141
[MIRROR] Speeds up simple_animals/hostile/proc/CanAttack()
2017-10-01 15:49:44 -04:00
LetterJay
e3810ef517 Merge branch 'master' into upstream-merge-31128 2017-10-01 15:46:15 -04:00
LetterJay
6ca3deb8d1 Merge branch 'master' into upstream-merge-31129 2017-10-01 15:45:54 -04:00
oranges
c56bb27bbd Merge pull request #31167 from tgstation/Cyberboss-patch-2
Prompt for observer confirmation now happens when you click it initially
2017-10-01 14:43:52 -05:00
LetterJay
6572781b63 Update forced_movement.dm 2017-10-01 14:43:06 -05:00
LetterJay
fafd98ed0e Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142
[MIRROR] Fixes cogscarab sprites not updating
2017-10-01 15:42:35 -04:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
LetterJay
5ec781502c Merge branch 'master' into upstream-merge-31116 2017-10-01 15:09:10 -04:00
LetterJay
4e80c2574a Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069
[MIRROR] Cleanup to various loc assignments and nearby code
2017-10-01 15:08:21 -04:00
LetterJay
eb24540ba3 Merge pull request #3017 from Citadel-Station-13/upstream-merge-31108
[MIRROR] Corrected shuttle refuel time
2017-10-01 15:07:43 -04:00
kevinz000
d76eb00634 Update viral.dm 2017-10-01 13:11:05 -05:00