Commit Graph

24153 Commits

Author SHA1 Message Date
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
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
3ab7f408a7 Merge pull request #35283 from AutomaticFrenzy/patch/research-logs
Fix research investigate logs
2018-02-05 02:07:18 -02:00
XDTM
33e8f9f65a Intelligence potions won't override previously known mob languages 2018-02-04 16:59:31 -06: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
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
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
Ashe Higgs
a81c2add15 Buffs integration cog generation (#35195) 2018-02-04 02:04:23 -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
MrDoomBringer
61b63b1752 Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#35249)
* yaga

* node change

* okay cobby
2018-02-04 01:32:52 -06:00
arsserpentarium
0b757c82ae battery rig fix (#35254)
* fix

* oops

* Auto stash before rebase of "tgstation/master"

* remove double notification
2018-02-04 01:30:20 -06:00
Jordan Brown
96d88b808a Merge pull request #35248 from KorPhaeron/gravity2
Fixes mecha grav catapult not being available in techwebs
2018-02-04 01:15:33 -05:00
ShizCalev
34897d8709 Removed tripAI landmark (#35256) 2018-02-04 01:13:40 -05:00
Tad Hardesty
11ae82148c Fix research investigate logs 2018-02-03 16:27:18 -08:00
MrDoomBringer
bce710c796 Adds sprites for conveyor belt constructs (#35252)
* lemme just convey this thought

* slight sprite update

* asdf
2018-02-03 18:53:29 -05:00
Kyle Spier-Swenson
47f3d89265 raises the cid check disconnect time out (#35244)
Disconnects from deleting the client are immediate, where are other commands are queued to some degree or another, browse is the worst one of all since it has to queue behind after connect resource sends as well as the asset cache or browse_rsc calls.

I'm finding hints that clients on lagger connections are getting disconnected before getting the reconnect command, and I was able to reproduce this myself on a cell phone connection while connecting to terry
2018-02-03 14:09:25 -05:00
vuonojenmustaturska
5d37ce3ea5 Merge pull request #35208 from Xhuis/standard_borg_abscond
Fixes servant cyborgs with the Standard module not having Abscond
2018-02-03 01:42:24 +02:00
KorPhaeron
61569bd662 Fixes mecha grav catapult construction 2018-02-02 17:24:10 -06:00
Leo
1e8e46e4f4 Merge pull request #35216 from optimumtact/goodbyecruelandunassocaiatedworld
Removes ketrazine
2018-02-02 21:18:46 -02:00
Ashe Higgs
5d999571a1 Adds pineapples to botany, and Hawaiian pizza (#35205)
* Adds pineapples.
2018-02-02 19:35:31 +02:00
Dax Dupont
29df7a8ef2 Hijack objectives will only be given out if there are 30 or more players. (#35202) 2018-02-02 14:39:11 -02:00
Ashe Higgs
6ba865b112 makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)
* traps patch

* flags!
2018-02-02 11:14:38 +01:00
vuonojenmustaturska
13ef0ea21e Merge pull request #35185 from Xhuis/eyesontheinsideofourbrains
Fixes white "eye" pixels appearing on races with custom eyes on their sprite
2018-02-02 02:19:36 +02:00
oranges
1aef06f9e5 Removes ketrazine
bye felicia
2018-02-01 22:47:15 +00:00
Xhuis
d7a815227a Fixes standard cyborgs not having Abscond 2018-02-01 15:04:10 -05:00
vuonojenmustaturska
72ddb81048 Merge pull request #34872 from AnturK/theresabraininymyhead
Fixes changelings retaining fake brains on de-changelining
2018-02-01 17:00:03 +02:00
Jordan Brown
d8b8086fdb Merge pull request #35079 from tortellinitony/easter
Future proofs Easter calculations
2018-02-01 09:47:00 -05:00
AnturK
75c2173faa Okay but i'm not going to check if changeling dullahans work 2018-02-01 10:11:04 +01:00
TechnoAlchemist
46af0ba6fb Spelling FIX 2018-01-31 22:18:46 -06:00
Leo
bf8983dd7e Merge pull request #35150 from DaxDupont/myanusisbleeding
Fixes a naughty dot
2018-01-31 22:38:29 -02:00
Leo
6c1d7cf6b8 Merge pull request #35145 from vuonojenmustaturska/acidtypos
Fixes a couple of typos and ports one New to Initialize
2018-01-31 20:14:22 -02:00
Xhuis
dad2aa7ae4 Removes white eyespots from several species 2018-01-31 16:05:35 -05:00
Ashe Higgs
cf5e28ad83 Give integration cogs power generation (#35181) 2018-02-01 09:09:44 +13:00
Jordan Brown
9e0eaa3b00 Merge pull request #35122 from CosmicScientist/you-say-tomaetoe-i-say-tomato-youre-wrong
Tomatoes and other foods found to have girl parts; removed from vegetable piles
2018-01-31 10:10:31 -05:00
ShizCalev
3c345d99de Fixes lightfixture placement issue 2018-01-31 09:04:51 -06:00
AnturK
5c8195cebc Removes maptext on morph restore. 2018-01-31 09:04:02 -06:00
Liam
85976b0e39 bye 2018-01-30 14:53:13 -06:00
Dax Dupont
7968bd40f7 Fixes errand dot 2018-01-30 21:27:34 +01:00