Commit Graph

21392 Commits

Author SHA1 Message Date
Leo
517f86ba76 Merge pull request #34533 from Buggy123/patch-56
Fixes integrity value for non-reinforced plasma window
2018-01-18 10:10:11 -02:00
deathride58
0c282b8865 [READY] Allows the supermatter's radiation collectors to produce research points in short bursts (#33916)
* allows radiation collectors present on the station roundstart to generate research points

* fixes bitcoin production rate, fixes multitool not activating multitool_act properly

* adds sounds, adds hint text, makes all rad collectors created on the station z-level connect to rnd, and fixes multitools acting weird

* nerfs criticism, makes rad collectors simply check for techwebs and z-level each process instead of during initialization

* fixes compiling error, is_station_level
2018-01-17 12:17:25 -05:00
Jordan Brown
38e8bdeaeb Merge pull request #34500 from Xhuis/recallfix
fixes a mass recall runtime error that prevented it from working
2018-01-17 08:09:10 -05:00
Buggy123
4ff5196a07 Fixes integrity value for reinforced plasma window 2018-01-17 02:56:08 -05:00
arsserpentarium
d35f3da470 [READY]Circuitry lab (#34493)
* spelling

* base

* maps

* merge

* firealarm

* floor

* floor again

* if you insist...

* DV

* DV(2)

* DV(3)

* fuck

* fuck

* apc

* boxapc
2018-01-16 17:44:26 -05:00
Jordan Brown
9dcdbff711 Nothing in this commit (#34520) 2018-01-16 15:40:15 -05:00
oranges
387e09c08f Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-17 09:36:15 +13:00
oranges
f065ee0098 Merge pull request #34378 from nicbn/yarr
Pirates are now skeletons
2018-01-17 09:34:07 +13:00
Ashe Higgs
ea5924bca8 Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow (#34427)
* Portal tweaks, and blocked atmos

* Update servant_blocker.dm

* Update servant_blocker.dm

* Update servant_blocker.dm
2018-01-17 09:33:19 +13:00
oranges
7fe928d11a Merge pull request #34468 from ShizCalev/redundant-trim
Cleans up some redundant stripped_input usage
2018-01-17 09:32:00 +13:00
oranges
afd92a5b12 Merge pull request #34464 from uraniummeltdown/dumbcult
Removed the dumb iscultist() check in runed metal's attack() proc
2018-01-17 09:31:15 +13:00
kevinz000
6ebc926f00 Fixes lavaboat buckling (#34450)
* Buckle order

* lavaboats
2018-01-17 09:30:14 +13:00
oranges
31217df709 Merge pull request #34470 from Cyberboss/MoveMotd
Moves load_motd to config controller
2018-01-17 09:27:35 +13:00
oranges
5adf17bf4a Merge pull request #34413 from kevinz000/patch-430
Allows C4 on mobs again
2018-01-17 09:27:09 +13:00
oranges
b979a01711 Merge pull request #34429 from AutomaticFrenzy/patch/rpd-bad-placement
Fix RPD embedding fixtures inside lattices and girders
2018-01-17 09:26:11 +13:00
BordListian
451bd0d1ed Stray bullets and explosions don't blow up the entire syndi lava base anymore (#34401)
* - Changes explosions to save a reference to the epicenter atom
- Changes syndicate bomb cores to have themselves as the epicenter, removing a redundant get_turf call
- Changes explosive plastitanium walls to only be triggered by bomb core explosions. This is a tad cumbersome but there's only 12 of these walls in the game.

* - Removes debug code

* - Can't hurt
2018-01-16 09:35:57 -05:00
Jordan Brown
603cc77136 Merge pull request #34475 from ShizCalev/internals-metal
Makes tanks made of metal
2018-01-16 09:33:19 -05:00
Jordan Brown
c20ae96884 Merge pull request #34478 from ChangelingRain/runtimefix
Fixes a variety of runtimes that happen if a servant tries to access scripture without servants being properly active
2018-01-16 09:32:00 -05:00
Jordan Brown
3a3c692d0d Merge pull request #34491 from Xhuis/the_lightbulb
Adds a new bar sign, The Lightbulb (take 2)
2018-01-16 09:27:14 -05:00
AnturK
332e7ca474 Makes getFlatIcon slower. (Also more precise) (#34199)
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
2018-01-16 08:32:35 -05:00
uraniummeltdown
8d5030f3a7 rename all 'clown' to 'bananium' for bananium mineral objects (#34462) 2018-01-15 23:02:18 -05:00
kevinz000
1ee607fc2d Fixes mat container + emags (#34449) 2018-01-15 21:57:52 -05:00
Tad Hardesty
a9ced2ddcf Fix RPD embedding fixtures inside lattices and girders 2018-01-15 17:26:48 -08:00
Xhuis
77b4d36056 fixes hte mass recall not working 2018-01-15 20:07:55 -05:00
XDTM
76b5ee3966 Xenobiology Species Rework (#34166)
I've always found grating that xenobiology had access to species they had no business working with, and slime magic can only explain so much. My idea is to separate those species into their respective departments/antags, instead of having them all into a centralized, cheap source.

    Androids should be made by robotics through augmentation
    Podpeople are a botany feature
    Skeletons should be limited to liches or other magic antags
    Zombies should stay limited to romerol
    Golems are still available in adamantine slimes (and luminescents can morph into golems with them)
    Shadowpeople still lack an official place, but luminescents can become shadowpeople with black cores

The basic races are mostly human and lizard, and there are mutation toxins for those in case someone wants their species back after bodyswapping/ling mutation sting/etc.
2018-01-16 11:07:06 +13:00
oranges
11f6544f35 Merge pull request #34489 from ShizCalev/lightbulbrevert
Revert: Adds the Lightbulb bar sign (#34480)
2018-01-16 10:48:53 +13:00
MoreRobustThanYou
9ab6865f87 Greyscale wirecutters (#34385)
* Greyscale Wirecutters!

* WOOPS!

* Hopefully make the colors lighter.

* hexcodes

* Fixy fixy

* Add files via upload
2018-01-15 16:15:58 -05:00
ShizCalev
ebf519cdee Adds the Lightbulb bar sign (#34480)
(reverted from commit da1e14c107)
2018-01-15 16:08:46 -05:00
Ashe Higgs
da1e14c107 Adds the Lightbulb bar sign (#34480) 2018-01-15 16:06:08 -05:00
kevinz000
0c1a1ee80b Lowers ark volume 2018-01-15 15:04:34 -06:00
Xhuis
74fb50d509 Adds the Lightbulb bar sign 2018-01-15 14:36:56 -05:00
Joan Lung
162416946a Fixes a variety of runtimes that happen if a servant tries to access scripture without servants being properly active 2018-01-15 12:56:19 -05:00
ShizCalev
9c859dc289 Makes tanks made of metal 2018-01-15 12:45:08 -05:00
Cyberboss
6fe468e3b4 Moves load_motd to config controller 2018-01-15 10:44:25 -05:00
Kyle Spier-Swenson
5bceb36588 Fixes compiler errors in the preload_rsc external resource thingy (#34061)
Fixes compiler errors in the preload_rsc external resource thingy
2018-01-15 10:32:20 -05:00
ShizCalev
18c0928903 Redundant params 2018-01-15 10:22:58 -05:00
ShizCalev
b41322baad Cleans up some redundant trims 2018-01-15 10:19:12 -05:00
Emmett Gaines
867a58d576 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 09:42:14 -05:00
WJohn
fec56e4923 Remakes the space syndicate listening post. (#34309)
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
2018-01-15 14:17:04 +01:00
uraniummeltdown
309b39cdba removed the dumb iscultist() check in runed metal's attack() proc 2018-01-15 17:56:58 +05:00
ShizCalev
42df595372 Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 10:01:22 +01:00
coiax
978c2bd485 Various deadchat messages are more informative and consistent (#34326)
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
2018-01-15 09:55:54 +01:00
John Ginnane
2587222509 Fixed alt-click not working with stacks (#34396)
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
2018-01-14 23:04:18 -05:00
F-OS
57376811ec Tweaks spaceheater description (#34416)
* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Allah my loving lord and savior grant me mercy
2018-01-14 23:03:00 -05:00
Iamgoofball
7f07d82de4 Rocket Pods now require manual disassembly (#34374)
Bluespacing out simply wasn't metal enough tbh
2018-01-14 22:58:58 -05:00
kevinz000
a50f1529a3 Update plastic.dm 2018-01-14 11:38:05 -08:00
ShizCalev
3d08996463 Replaces cached get_area vars for names (#34338) 2018-01-13 21:55:47 -05:00
AnturK
8f3b337ee6 Fixes cables/lattices for lateloaded templates. 2018-01-13 14:50:37 -06:00
Leo
6f5e5a6f13 Merge pull request #34347 from AutomaticFrenzy/patch/ark-z
Fix the Ark's z-level checks
2018-01-13 13:00:33 -02:00
Leo
ac81f6aa91 Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime
Fix RPD runtimes and offsets of layered connector ports
2018-01-13 12:58:00 -02:00