Commit Graph

41433 Commits

Author SHA1 Message Date
Denton 58dbee9df3 Ugprade -> Upgrade 2018-02-06 10:13:32 +01:00
oranges 38c7050531 Merge pull request #35313 from DaedalusGame/red_hot_papermache
Makes orange colored papermache not burn into chasms
2018-02-06 20:41:33 +13:00
Kyle Spier-Swenson 3a5e73ec5f Delete zvent.dm (#35340)
* Delete zvent.dm

We don't use it, its ass, it likely doesn't even work, and space whats his name will be making something better.

* >somebody actually checked it
2018-02-06 00:51:54 -06:00
Dax Dupont 317574712f Fixes the AI from being able to magically turn on broken APCs (#35284)
* Fixes the AI from being able to magically turn on broken APCs

* actually shorted allows you to operate the interface still

* bleh

* kiki ya ya
2018-02-06 00:40:01 -05:00
Tad Hardesty dfc0f854a3 Properly allow cancelling DynEx debug verbs (#35325)
Selecting "Cancel" now actually cancels the output rather than acting
the same as inputting zero. Also fixes a spelling error.
2018-02-06 00:35:19 -05:00
nicbn 9348ad9aad Fixes bloodpack sprite issues (#35288)
* Fixes bloodpacks with question marks

* .

* .

* .
2018-02-05 20:21:13 -05:00
vuonojenmustaturska a18a63bcbf Merge pull request #35324 from AutomaticFrenzy/patch/defibrillator-runtime
Fix defibrillator mount runtiming continously while empty
2018-02-06 01:58:16 +02:00
AnturK 126a544a74 Slaughter demon, Morph, ERT / Deathsquad antag datums. (#35156)
auto_custom need to go so mind.objectives and special_role can go so here's a start. The rest will come in this PR or another if i get lazy.
2018-02-06 11:59:18 +13:00
vuonojenmustaturska 1e125e3254 Merge pull request #35322 from AnturK/missing-wrapper
Adds missing wrapper for abductor roundend report.
2018-02-05 23:46:58 +02:00
vuonojenmustaturska c4fd8715a5 Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291)
* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
2018-02-05 22:27:35 +01:00
MoreRobustThanYou 66b3628428 Fix holorays staying if you switch holopads (#35295)
* Fix holorays staying if you switch holopads

* Update hologram.dm
2018-02-05 23:15:51 +02:00
Leo 1e058846e8 Merge pull request #35316 from AnturK/commfix
Fixes comm message list for non-unique messages.
2018-02-05 18:37:20 -02:00
Iamgoofball 4eb008f5bb Nerfs Clogged Vents Harder (#35317)
* Nerfs Clogged Vents Harder

nnow requires 50 people minimum, lowers the weight down to 25

* Update vent_clog.dm
2018-02-05 22:01:54 +02:00
vuonojenmustaturska 9997750587 Merge pull request #35152 from 81Denton/mining-vendor-conscript
Rearranges mining vendor items and code, adds conscription kit
2018-02-05 17:37:43 +02:00
XDTM 380f901ba6 Eggs from the abductor egg gland now have a random reagent instead of acid 2018-02-05 09:13:16 -06:00
vuonojenmustaturska 80284182ba Merge pull request #35299 from ShiggyDiggyDo/arcadegrammar
fixes small grammar issue on arcades
2018-02-05 17:10:11 +02:00
MMMiracles 6c2db52ab3 Snowdin 2.0 (#35000)
* wrah wah wah waaaah

* fences, new mountain turfs, sprites, top-side finished, misc stuff

* quick fix

* cut my life into pieces, this is my last resort

* lots of work done to the underground segment, more fluff bits and topside work

* removing depreciated bits and tgm conversion

* step_off

* damn these dirty VARS

* changes n stuff

* wanna build a plasmaman?

* decals commit fix

* map detailing, loot spawns, plasma miners, cyberboss changes, plasma lava turning people into plasmamen

* tgm conversion

* new barricade sprites, final map edits before testing

* mountain wall fix

* Update snow_storm.dm

i ate too mucha pasta
2018-02-05 17:09:34 +02:00
Dax Dupont f3d99a0c34 Fixes power cell name and makes borgs use a standard high capacity cell. (#35265)
* Fixes name for upgraded power cell

* Harmonizes battery for cyborgs

* Remove duplicate battery code
2018-02-05 02:14:09 -02:00
Leo 61609a0c70 Merge pull request #35274 from XDTM/SlimeScan
Makes slime scanning more readable
2018-02-05 02:10:48 -02:00
Jordan Brown 71daca41c7 Makes flick_overlay use client time (#35271) 2018-02-05 02:09:30 -02:00
KorPhaeron d962858116 Fixes smugglers satchels being able to refresh items forever (#35270) 2018-02-05 02:08:17 -02:00
Leo 3ab7f408a7 Merge pull request #35283 from AutomaticFrenzy/patch/research-logs
Fix research investigate logs
2018-02-05 02:07:18 -02:00
Leo 661fde4925 Merge pull request #35286 from DaxDupont/commsfix
Fixes sending cross station messages during wait period.
2018-02-05 02:07:06 -02:00
Tad Hardesty 72e1c60cc2 Fix defibrillator mount runtiming continously while empty 2018-02-04 16:15:06 -08:00
XDTM 33e8f9f65a Intelligence potions won't override previously known mob languages 2018-02-04 16:59:31 -06:00
AnturK a6fabf9cf1 Adds missing wrapper for abductor roundend report. 2018-02-04 22:10:42 +01:00
AnturK bcd0dccd74 Fixes message list for non-unique messages. 2018-02-04 20:49:27 +01:00
BordListian 40b97d9f1c - Makes lava not burn into chasms 2018-02-04 19:39:05 +01:00
coiax c93b0aa97f Romerol works on dead people (#34870)
🆑 coiax
balance: Romerol is now effective on dead bodies, not just ones that are
still alive.
/🆑

Why? Because it seems silly that a zombie virus requires someone to be
alive, and zombie claws work on dead bodies.
2018-02-04 03:07:27 -06:00
Iamgoofball 9faa968010 [s] Fixes clogged vents delamming the supermatter (#35300)
wow forgot to commit thiss to the PR lmao
2018-02-04 03:04:23 -06:00
ShizCalev ee18d6f8e2 Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#34907)
* Cleanup

* .

* Synced special_role & factions with role defines

* Revert

* more cleanup

* fix
2018-02-04 03:03:34 -06:00
Buggy123 b2c456df73 Morgues now beep if the mob is clonable. (#34622) 2018-02-04 02:57:57 -06:00
Iamgoofball 725df4bd9b Buffs Clogged Vents (#34949)
* Buffs Clogged Vents

🆑 Iamgoofball
feature: Clogged Vents now has some teeth
/🆑

This was the only part of GoofEvents players liked

* Update effects_foam.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm
2018-02-04 02:51:47 -06:00
Cruix 47a57f63c5 Added transit tubes to the RPD (#35074) 2018-02-04 02:44:59 -06:00
nicbn dc09b1763e Adds tiny shards (#35070)
* Adds tiny shards

* .

* .

* .

* .

* .

* .
2018-02-04 02:40:01 -06:00
ShiggyDiggyDo d3fe887158 fixes grammar on arcade machines 2018-02-04 09:25:20 +01:00
Dax Dupont 14d58ddf07 Adds a log out button to record screen of the security records and also allows you to print photos (#35160) 2018-02-04 02:22:13 -06:00
Incoming5643 a3e6885582 Moves the rarely utilized bar drink flinging ability from an intrinsic bartenders are born with to an extrinsic book that anyone can learn the art from. Bartenders start with the book but it's also available from cargo. Also allows the ability to toggle where as previously bartenders were just stuck with it. (#35165) 2018-02-04 02:20:30 -06:00
Robustin fc5c1fdf95 Fixes Vape Pen (e-cig) reagent spam (#35182)
* Changed smoke machine argument

* Fixed e-cig reagent spam

* Update cigs_lighters.dm

* merge conflict

* the fuck is this merge conflict
2018-02-04 02:14:34 -06:00
Jittai df1a99ed8d [READY] Fixes de-initialization of cleanables-ash (#35191)
* Fixes de-initialization of cleanables-ash

* boop

* :x

* better execution

* prevent pile-up

* special ash

* comment cleanup

* cleanup 2
2018-02-04 02:12:22 -06:00
Robustin ee87af19f0 Disentangles Command Reports from Metagame (#35192)
* False report fix

* Less Accurate Command Report
2018-02-04 02:10:20 -06:00
ShiggyDiggyDo baa6bba7e0 Steampunk Watches! (#35187)
* Adds steampunk watches

* Adds steampunk watches to arcade machines

* The steampunk watch can now play a noise!
2018-02-04 02:07:10 -06:00
Ashe Higgs a81c2add15 Buffs integration cog generation (#35195) 2018-02-04 02:04:23 -06:00
Slignerd f5046f86ec Moves the spare ID inside the captain's locker (#35219)
* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)
2018-02-04 02:01:33 -06:00
ShizCalev b079155961 Readds the syndicate comms officer (#35193) 2018-02-04 01:57:42 -06:00
AnturK c61037629a Adds some customization to ruin loader (#35209)
* Adds some customization to ruin loader

* Bluh

* stuff

* Fixes
2018-02-04 01:54:40 -06:00
KorPhaeron f351c6da61 Drone speed (#35233) 2018-02-04 01:50:23 -06:00
KorPhaeron a104bffd8b Stops Luminous Slime spam (#35240) 2018-02-04 01:35:04 -06:00
KorPhaeron 214272c8c8 Fixes ancient goliathes (#35242) 2018-02-04 01:33:46 -06:00
KorPhaeron 1a17244d26 Fixes ancient goliathes tentacle attack (#35243) 2018-02-04 01:33:20 -06:00