Commit Graph

22812 Commits

Author SHA1 Message Date
Robustin c353b77f4e Smoke Machine Updates & Fixes (#31598)
* Smoke Machine Update

* Update smoke_machine.dm

* Compiling again
2017-10-13 15:49:24 -06:00
WJohn bc4b809b9a Replaces boxstation white ship with metastation's white ship. (#31571)
* Replaces boxstation white ship with metastation's white ship. Gives metastation white ship some weak laser turrets so it has slight protection against space carp.

* TGM meta shuttle template

* Does what shiz asked, probably.

* More fixes for shiz
2017-10-13 15:48:22 -06:00
vuonojenmustaturska 673abab94e Small lighting perf tweak (#31635)
* lightshit

* Revert "lightshit"

This reverts commit 25a1b6e4a104546c6393d3c472c0412f7580fe96.

* bfghsfg

* kreegah

* honk
2017-10-13 15:29:50 -06:00
MoreRobustThanYou d6dbe3adaa Medibots will no longer inject people in lockers/sleepers/etc (#31648) 2017-10-13 15:25:54 -06:00
francinum 7ba6711174 Fixes various Nanotrasen capitalizations (#31620)
* Fixes capitalization of Nanotrasen for secsuits

gimme the GBP

* Fixes this one too
2017-10-13 12:12:56 -05:00
ShizCalev d927f90eab Various grammar fixes 2017-10-13 11:55:54 -05:00
militaires b052ebab21 Fixes Shambrero Penguin names 2017-10-13 11:55:27 -05:00
militaires bb08fac0db Revert "Fixes shambrero penguin's name"
This reverts commit 59376543da685167c14eb683342bda2edb8b8eeb.
2017-10-13 11:55:27 -05:00
militaires fdb002da06 Fixes shambrero penguin's name 2017-10-13 11:55:27 -05:00
nicbn 0fa8587f83 Bullet decals tweak (#31420)
* wee

* screen clock update

* resist and stop pulling

* Whoop, Joan messed up on the selection border so here's some fixed icons for that

* there we go

* Update walls.dm

* Update walls.dm

* Update walls.dm
2017-10-13 10:46:45 -04:00
Jordan Brown 963fc6b4ae Merge branch 'master' into patch/thethe 2017-10-13 10:23:55 -04:00
Emmett Gaines 456cd10d94 Radiation rework and subsystem (#30909)
* radiation rework and subsystem

* moves a few things to initialize and adds radiation insulation

* adds a radiation contamination mechanic and makes requested changes

I'm terrified by the possibilities from this

* radiated objects give off light

and hopefuly contamination is balanced

* fixes runtimes and an mc crash kek

removed the lighting part of contaminated objects
attempted some more balancing

* Collectors output power in process() gradualy

And some more balancing tweaks

* Excludes a bunch of things from becoming radioactive

* Ready for testmerge balancing

* Inverse square law was swapped

* testmerge balancing

fixes the geiger counter
buffs collector power gen
nerfs sm radiation
slightly buffs rad insulation
nerfs rad damage (and its burn)
raised the minimum radiation

* disabling the radiation subsystem won't build up rad wave datums forever

* rewrites how mobs handle radiation

upgrades geiger counter functionality
and more balance tweaks

* cleans up stuff and removes debug message

* Slight contamination buff

* Major rad wave performance boost

Also improves rad insulation
Buffs contamination, again

* Fixes insulation runtime

More balance and performance tweaks

* fixes rad collectors not receiving power

* The final balance commit

Fixes a major bug causing radiation to underperform
More geiger counter changes that will be changed more to add sounds

* Monkey business

* Geiger counter sounds

* cleanup and move components to their own initialize

* Some code cleanup

And forgotten changes

* Cleans up some trailing returns

* Mapping changes
2017-10-13 10:22:00 -04:00
kevinz000 2d229eecb4 Fixes preferences generation (#31607) 2017-10-13 10:14:22 -04:00
Jordan Brown d138a81bd4 Merge pull request #31614 from AnturK/zap
Fixes electrocution animation
2017-10-13 10:13:24 -04:00
Armhulen 882e561f8c Adds a fireball from the heavens as an admin smite (#31502)
* really gamers?

* yeah yeah YEAH

* cucked again!

* it works

* I SAID IT WORKS
2017-10-12 21:37:11 -04:00
Jordan Brown 40ffeff63c Merge pull request #31643 from duncathan/letsallsitdownbythefireplaceandwarmup
Activates global warming
2017-10-12 21:03:29 -04:00
MoreRobustThanYou 99f8c92fc0 Adds sports bras (#31590)
* uguuu~

* Update sprite_accessories.dm

* Update sprite_accessories.dm

* make them an undershirt
2017-10-12 19:08:10 -04:00
duncathan 7ffea9285d who turned off the pilot light in the boiler room? no wonder it was cold 2017-10-12 16:18:38 -06:00
Jordan Brown bde243266b Merge pull request #31588 from ninjanomnom/shuttle-parallax
Fixes stationary mob parallax
2017-10-12 17:06:05 -04:00
Jordan Brown 647237f32f Merge pull request #31582 from feemjmeem/smoke-log-announcing
Notify admins when someone activates a smoke machine
2017-10-12 17:03:15 -04:00
Jordan Brown 4cbfc4ab79 Merge pull request #31584 from AnturK/ruinshuttle
Fixes ruins spawning over shuttle docks
2017-10-12 17:02:23 -04:00
YPOQ eaeabcca6f Fixes canisters breaking multiple times (#31586) 2017-10-12 16:47:13 -04:00
Jordan Brown 193f4e571c Merge pull request #31585 from ShizCalev/empty-light-editor-fix
Fixes empty light fixtures showing as working lights in DM
2017-10-12 16:27:22 -04:00
ShizCalev 477384ce78 Refactors away mission & space ruin area code (#31512) 2017-10-12 11:46:30 -06:00
kevinz000 6f6bdcd7d3 Adds tick check to ore boxes (#31396)
* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm
2017-10-12 11:38:56 -06:00
kevinz000 07e4158882 Update bomb.dm (#31557) 2017-10-12 11:36:09 -06:00
ShizCalev 49e5b23735 Fixes conveyor belt layering (#31569) 2017-10-12 11:34:11 -06:00
Jordan Brown b6a2517069 Merge pull request #31605 from AnturK/cryofix
Fixes cryo
2017-10-12 12:55:24 -04:00
duncathan salt a68d7ebd9a makes vacuums "cold", sort of (#31542) 2017-10-12 13:47:19 -03:00
Tad Hardesty b821006ce1 Fix lavaland turfs looking awkward to AIs (#31554) 2017-10-12 17:39:38 +02:00
Kyle Spier-Swenson 76b61e69cf Fixes client vv not working. (#31556) 2017-10-12 17:37:43 +02:00
AnturK 208c6159fb Fixes electrocution animation 2017-10-12 16:35:07 +02:00
kevinz000 c43e205959 loc -- > forcemove (#31176)
* manually done

* Update syndicatebomb.dm

* Update robot.dm

* Update atoms_movable.dm

* Update syndicatebomb.dm

* Update devil.dm

* Update bedsheet_bin.dm

* Update vending.dm

* Update bedsheet_bin.dm

* Update atoms_movable.dm

* Update syndicatebomb.dm

* Update vending.dm

* Update bedsheet_bin.dm

* Update devil.dm

* Update door_assembly.dm
2017-10-13 00:12:03 +13:00
AnturK 9063fea181 Fixes cryo 2017-10-12 12:13:58 +02:00
AnturK a001f58480 _1 2017-10-12 08:08:10 +02:00
duncathan salt 945a58cf85 unfucks filters (#31599)
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization

* unfucks filters

* updates maps to match
2017-10-12 08:07:01 +02:00
Tad Hardesty c1794bb402 Fix many instances of "the the"
All uses of "the [src]" have been fixed, as well as other bad string
interpolation directly adjacent to such uses.

In addition to its message, the circumstances under which the tracking
implant locator fails have been updated to use the correct define,
malfunctioning on CentCom rather than on the station.
2017-10-11 21:55:44 -07:00
Jordan Brown 0193bdd668 Datumizes world/Topic (#31543)
* Datumizes world/Topic

* active_players requires comms_key
2017-10-12 14:46:51 +13:00
ninjanomnom 7c8c8a6d5e fixes stationary client parallax 2017-10-11 21:29:55 -04:00
Jordan Brown 7e54c70c49 Adds round id to the banning panel (#31545) 2017-10-11 20:42:16 -04:00
Mercenaryblue 05e1f521e6 Added Banana Peels Inhand Sprites (#31551)
Added in-hand Banana Peels sprites.
Default, Mime, and Bluespace.
2017-10-11 20:41:27 -04:00
PKPenguin321 ec0b236473 Removes unwelding a singletank (#31550)
Fixes #27341
2017-10-11 20:41:04 -04:00
Incoming5643 0c8e245c56 when cleanbot cleans a tile, it will now fully cleans the tile (#31548)
As opposed to taking out one stain at a time
2017-10-11 20:40:36 -04:00
Armhulen 15241d90c5 Mega Carp Re-Carpening: Carpatastrophe! (#31365)
* healing, thank you kor!

* why isn't this working

* balance sucks

* fixed, whoops

* cuts-the-fat

* yay

* fixes

* cool beans
2017-10-12 11:07:53 +13:00
ShizCalev 9c59171afe Fixes empty light fixtures showing as working in DM 2017-10-11 16:53:23 -04:00
AnturK 1df4082525 Fixes ruins spawning over shuttle docks 2017-10-11 22:46:50 +02:00
Jordan Brown 7da46948dc Fixes init times (#31580)
* Fixes init times

* Why even copy?
2017-10-11 14:45:07 -06:00
Marc Uchniat e977392c22 implement message_admins for smoke machine activation 2017-10-11 16:27:35 -04:00
duncathan salt 454d16fe32 Minor refactor of how gas IDs are handled (#31528)
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization
2017-10-11 15:04:12 -04:00
Robustin 00b694b07a Fixes explosives in bags not exploding (#31516)
* Fixes most bomb in bag issues

* Update explosion.dm

* Added gib argument

* Typeless loops

* No more touching gib code

* Update death.dm

* Update death.dm

* Update death.dm

* fucking whitespace

* Contents are now exploded before gibbing

* severity
2017-10-11 11:00:19 -06:00