Commit Graph

4957 Commits

Author SHA1 Message Date
LetterJay
f488fa3ac3 Merge pull request #3356 from Citadel-Station-13/upstream-merge-31565
[MIRROR] Stargazers are now station-restricted, and cogged APCs are now quiet
2017-10-13 00:20:54 -04:00
LetterJay
f4852314dd Merge pull request #3353 from Citadel-Station-13/upstream-merge-31588
[MIRROR] Fixes stationary mob parallax
2017-10-13 00:20:46 -04:00
LetterJay
b43a207390 Merge pull request #3349 from Citadel-Station-13/upstream-merge-31586
[MIRROR] Fixes canisters breaking multiple times
2017-10-13 00:20:38 -04:00
LetterJay
116f06f428 Merge pull request #3348 from Citadel-Station-13/upstream-merge-31579
[MIRROR] Fixes foam darts on cardboard cutouts and shooting range targets
2017-10-13 00:07:14 -04:00
LetterJay
ea7b3d101d Merge pull request #3347 from Citadel-Station-13/upstream-merge-31585
[MIRROR] Fixes empty light fixtures showing as working lights in DM
2017-10-13 00:06:06 -04:00
LetterJay
31914b7723 Merge pull request #3341 from Citadel-Station-13/upstream-merge-31549
[MIRROR] Fixes plastic explosive issues
2017-10-13 00:04:47 -04:00
LetterJay
b0f1ecda37 Merge pull request #3336 from Citadel-Station-13/upstream-merge-31569
[MIRROR] Fixes conveyor belt layering
2017-10-12 23:55:05 -04:00
LetterJay
f072cac695 Merge pull request #3335 from Citadel-Station-13/upstream-merge-31618
[MIRROR] Fixes topic key validation
2017-10-12 23:54:03 -04:00
LetterJay
69d27f7231 Merge pull request #3334 from Citadel-Station-13/upstream-merge-31619
[MIRROR] Fixes adminwho having namecheck as a keyword
2017-10-12 23:50:00 -04:00
LetterJay
aaa76a47f5 Merge pull request #3333 from Citadel-Station-13/upstream-merge-31617
[MIRROR] Fixes topic handlers
2017-10-12 23:49:26 -04:00
LetterJay
25396db2df Merge pull request #3332 from Citadel-Station-13/upstream-merge-31605
[MIRROR] Fixes cryo
2017-10-12 23:45:42 -04:00
LetterJay
d02dcb496e Merge pull request #3331 from Citadel-Station-13/upstream-merge-31542
[MIRROR] makes vacuums "cold", sort of
2017-10-12 23:40:55 -04:00
LetterJay
0263f44791 Merge pull request #3330 from Citadel-Station-13/upstream-merge-31554
[MIRROR] Fix lavaland turfs looking awkward to AIs
2017-10-12 23:38:00 -04:00
LetterJay
3ee44b45f9 Merge pull request #3329 from Citadel-Station-13/upstream-merge-31556
[MIRROR] Fixes client vv not working.
2017-10-12 23:27:54 -04:00
LetterJay
b1232af6f5 Merge pull request #3327 from Citadel-Station-13/upstream-merge-31610
[MIRROR] Fix world/Topic calling the wrong handler proc
2017-10-12 23:25:34 -04:00
Ashe Higgs
f9436e53c4 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565)
* Clockwork power generator tweaks

* Includes a blob_allowed check
2017-10-12 18:32:37 -05:00
Jordan Brown
7ef36802ff Merge pull request #31588 from ninjanomnom/shuttle-parallax
Fixes stationary mob parallax
2017-10-12 16:07:12 -05:00
YPOQ
848016ab15 Fixes canisters breaking multiple times (#31586) 2017-10-12 15:48:17 -05:00
vuonojenmustaturska
12ef284e68 Fixes foam darts on cardboard cutouts and shooting range targets (#31579) 2017-10-12 15:46:05 -05:00
Jordan Brown
572f3b8905 Merge pull request #31585 from ShizCalev/empty-light-editor-fix
Fixes empty light fixtures showing as working lights in DM
2017-10-12 15:27:37 -05:00
ShizCalev
4fe003af83 Fixes plastic explosive issues (#31549) 2017-10-12 12:38:08 -05:00
ShizCalev
f696ada7c8 Fixes conveyor belt layering (#31569) 2017-10-12 12:34:19 -05:00
Jordan Brown
76654718f1 Fixes topic key validation 2017-10-12 12:23:00 -05:00
Jordan Brown
e595c2f2fc Fixes adminwho having namecheck as a keyword 2017-10-12 12:22:51 -05:00
Jordan Brown
8ff51df06f Fixes topic handlers 2017-10-12 12:21:41 -05:00
Jordan Brown
763bcc59ee Merge pull request #31605 from AnturK/cryofix
Fixes cryo
2017-10-12 11:56:09 -05:00
duncathan salt
425915615b makes vacuums "cold", sort of (#31542) 2017-10-12 11:47:51 -05:00
LetterJay
06061f0870 Merge pull request #3301 from Citadel-Station-13/upstream-merge-31530
[MIRROR] Allows snoring while unconscious
2017-10-12 12:37:03 -04:00
LetterJay
dc5aeb33e6 Merge pull request #3294 from Citadel-Station-13/upstream-merge-31475
[MIRROR] Removes spawns from assembly code
2017-10-12 12:36:53 -04:00
Tad Hardesty
00606b9303 Fix lavaland turfs looking awkward to AIs (#31554) 2017-10-12 10:40:38 -05:00
Kyle Spier-Swenson
6c27182bec Fixes client vv not working. (#31556) 2017-10-12 10:39:28 -05:00
kevinz000
9deb3df6af Update material_container.dm (#31555) 2017-10-12 10:39:20 -05:00
Jordan Brown
c4653e6f5e Fix world/Topic calling the wrong handler proc (#31610) 2017-10-12 10:37:38 -05:00
LetterJay
41846d0793 Merge branch 'master' into upstream-merge-31599 2017-10-12 11:00:37 -04:00
LetterJay
4a8f3d0e41 fuck this shit 2017-10-12 09:58:16 -05:00
LetterJay
2e503acc57 Update assembly.dm 2017-10-12 06:21:30 -05:00
LetterJay
f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
[MIRROR] Minor refactor of how gas IDs are handled
2017-10-12 07:19:30 -04:00
LetterJay
813e54e5ae Merge pull request #3322 from Citadel-Station-13/upstream-merge-31544
[MIRROR] Server maint logs when nulls enter the clients list
2017-10-12 07:19:21 -04:00
LetterJay
ec07e7b06f Merge pull request #3321 from Citadel-Station-13/upstream-merge-31541
[MIRROR] Allows sillicons to use vending machines.
2017-10-12 07:19:03 -04:00
LetterJay
3c55163ebd Merge pull request #3319 from Citadel-Station-13/upstream-merge-31464
[MIRROR] Make SStgui actually read the html from the disk at runtime
2017-10-12 07:18:42 -04:00
LetterJay
07f0a5f503 Merge pull request #3318 from Citadel-Station-13/upstream-merge-31365
[MIRROR] Mega Carp Re-Carpening: Carpatastrophe!
2017-10-12 07:18:35 -04:00
LetterJay
3ad9f5dc1e Merge pull request #3317 from Citadel-Station-13/upstream-merge-31500
[MIRROR] sleeping carp grabs now put out a message
2017-10-12 07:18:27 -04:00
LetterJay
d82459ae45 Merge pull request #3316 from Citadel-Station-13/upstream-merge-31548
[MIRROR] Shameless Cleanbot Buff
2017-10-12 07:18:18 -04:00
LetterJay
2a5ac01177 Merge pull request #3315 from Citadel-Station-13/upstream-merge-31550
[MIRROR] Removes the ability to unweld a singletank
2017-10-12 07:18:10 -04:00
LetterJay
1e87d0d2a2 Merge pull request #3314 from Citadel-Station-13/upstream-merge-31551
[MIRROR] Added Banana Peels Inhand Sprites [Partial Fix - #30081]
2017-10-12 07:17:57 -04:00
LetterJay
fe00337475 Merge pull request #3313 from Citadel-Station-13/upstream-merge-31545
[MIRROR] Adds round ID to the banning panel
2017-10-12 07:17:34 -04:00
LetterJay
9af6ffa946 Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543
[MIRROR] Datumizes world/Topic
2017-10-12 07:16:44 -04:00
LetterJay
05100a0c6a Merge pull request #3310 from Citadel-Station-13/upstream-merge-31282
[MIRROR] Reebe cogscarabs have infinite power and can recite scripture during non-clockcult rounds
2017-10-12 07:16:35 -04:00
LetterJay
f19437bae9 Merge pull request #3307 from deathride58/crewobjtweaksgalore
Crew Obj & Miscreant system optimizations and tweaks
2017-10-12 07:16:13 -04:00
LetterJay
e15c337851 Merge pull request #3306 from Citadel-Station-13/upstream-merge-31449
[MIRROR] Datum antag wizard.
2017-10-12 07:15:53 -04:00