Commit Graph

47 Commits

Author SHA1 Message Date
AnturK
c3c9f4c668 Highlander antag datum (#35519)
* Highlander antag datum

* Forgot debug line

* Also this
2018-02-11 16:32:06 -05:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456)
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
2018-02-11 16:06:12 +13:00
Jordan Brown
f5ff686404 Merge pull request #35424 from ShizCalev/var-cleanup
Replaces some var values with defines
2018-02-10 12:10:40 -05:00
ShizCalev
f7fe600540 Cleans up vars with defines 2018-02-09 00:20:41 -05:00
Jordan Brown
ca3976fc1d Merge pull request #35435 from optimumtact/mrtyhasahorsecunt
Revert "Adds the saltmine shuttle. (#35369)"
2018-02-09 00:03:36 -05:00
Robustin
7dee5379d7 Cult fixes and UI improvement (#35178)
* Blood spell fixes and UI improvement

* Bastard sword bug

* Update blood_magic.dm

* woops parenthesis

* Update blood_magic.dm

* space
2018-02-09 14:10:50 +13:00
oranges
b1f301b39b Revert "Adds the saltmine shuttle. (#35369)"
This reverts commit c7ee29b5b0.
2018-02-08 01:49:57 +00:00
Dax Dupont
c7ee29b5b0 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 15:16:54 +02:00
vuonojenmustaturska
e264c15aac Merge pull request #35385 from AnturK/custoantagfixup
Fixes custom antags for random event morph/slaughter demon.
2018-02-07 13:22:38 +02:00
Robustin
616444a14c Reverts oysters (#35361) 2018-02-06 16:43:06 -05:00
vuonojenmustaturska
3db6e34dda Merge pull request #35353 from Robustin/constructlimit
Reduced shards and shells for the cult
2018-02-06 21:37:28 +02:00
AnturK
4a046df6df Fixes custom antags for random event morph/slaughter demon. 2018-02-06 14:59:33 +01:00
Robustin
b87a9f6a15 Fixed insufficient cultists warning (#35292)
* Fixed insufficient cultists warning

* Insufficient cultist fix

* removed duplicate var

* Update runes.dm
2018-02-06 13:54:17 +01:00
coiax
5b0221f49b Egg changes (#35268)
🆑 coiax
add: Eggs now contain 5u of egg yolk. Breaking an egg in a glass
container adds all reagents inside to the container. If you're laying
acidic eggs, then you'll get 5u of egg yolk and 10u of sulphuric acid.
Egg glands now make you act like a chicken while laying eggs. Egg laying
makes you use the aliennotice span.
/🆑

- coloured eggs no longer have "taste_desc", as that only applies to the
nutrient reagent, which eggs no longer have.

This makes eggs more consistent in their contents and behaviour, and
prevents you from using eggs laid by abductor egg glands in cooking
without removal of the acid first.
2018-02-06 13:50:22 +02:00
ACCount
100c4b6114 Adds new helper: use_tool, shakes things up in tool code (#35095)
* small changes

* Adds a use_tool helper and changes some tools to use it

* Ports most tool operations to use_tool

* Converts more tool operations to use_tool and tool_act

* Changes some things to default_unfasten_wrench

* Improves tool_behavior support in mech construction

* Code review memes

* Fixes all instant use_tool calls failing

* Code improvements

* merge fixes
2018-02-06 11:02:53 +01: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
Robustin
1b4a5574db Reduced construct shells from archive 2018-02-05 12:48:08 -05:00
Robustin
12d7138fab No more sharding suicides 2018-02-05 12:47:18 -05: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
AnturK
a6fabf9cf1 Adds missing wrapper for abductor roundend report. 2018-02-04 22:10:42 +01: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
Ashe Higgs
a81c2add15 Buffs integration cog generation (#35195) 2018-02-04 02:04:23 -06: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
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
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
AnturK
75c2173faa Okay but i'm not going to check if changeling dullahans work 2018-02-01 10:11:04 +01:00
Ashe Higgs
cf5e28ad83 Give integration cogs power generation (#35181) 2018-02-01 09:09:44 +13:00
AnturK
5c8195cebc Removes maptext on morph restore. 2018-01-31 09:04:02 -06:00
Robustin
418a8c0112 Cult Update (#33810)
* Cult overhaul
2018-01-30 21:59:03 +02:00
vuonojenmustaturska
f45742a033 Heartless humans now display as unsuitable for abductor experiments (#34951) 2018-01-30 15:25:17 -02:00
vuonojenmustaturska
5afb33f24f Merge pull request #35047 from ShizCalev/servant_blocker-bomb
Fixes being able to bomb servant blockers
2018-01-29 22:33:12 +02:00
Ashe Higgs
54f5be614a brief CC power patch (#34880) 2018-01-29 21:32:46 +01:00
vuonojenmustaturska
9df47d0962 Buffs BZ gas by allowing it to interfere with lings' hivemind access and chem regen (#35061) 2018-01-29 14:32:10 -02:00
XDTM
9b93747d36 Abductor additions: replaces and improves glands, new surgery type (#35012)
* Abductor additions: improves glands, new surgery type

* fixes
2018-01-29 11:50:32 +02:00
Jordan Brown
f0bc53d219 Merge pull request #34926 from ShizCalev/morguetray-revenant
Makes revenants spawn on dead bodies & bodycontainers
2018-01-28 19:03:14 -05:00
Leo
09db62ee8c Merge pull request #35025 from vuonojenmustaturska/toot
Warp whistle now respects notransform
2018-01-28 19:07:46 -02:00
AnturK
7c4e6b674e I'll just kill this type, seems rather useless. 2018-01-28 17:19:59 +01:00
AnturK
2905cc7415 Fixes changelings retaining fake brains on de-changelining 2018-01-28 17:19:59 +01:00
ShizCalev
42d3ee0fc7 Fixes being able to bomb servant blockers 2018-01-28 02:31:25 -05:00
Dax Dupont
efd8d06933 Fixes the eminence getting spammed by blessed tiles. (#34866)
* Fixes the eminence getting spammed by blessed tiles.

* Forgot to commit this

* world time meme
2018-01-28 09:35:34 +13:00
vuonojenmustaturska
b9c1932040 warp whistle now respects notransform 2018-01-27 22:14:55 +02:00
ShizCalev
25149f988c Deprecates landmark, spawns off bodies and trays 2018-01-26 12:59:00 -05:00
AnturK
3ce60ed792 Antag Reshuffling. Accomodating to people dumbasses caring about whitespace 2018-01-26 11:33:22 +01:00