5d5527855d
Merge pull request #35697 from praisenarsie/patch-34
...
Fixes addiction text
2018-02-16 11:33:04 -05:00
e2f94038da
Merge pull request #35702 from DaedalusGame/scholar-of-the-first-sin-edition
...
Removes secondary
2018-02-16 11:31:52 -05:00
d282c60c7d
Quote the armor lists ( #35668 )
2018-02-16 01:25:42 -05:00
90dbc7fea3
Merge pull request #35680 from MoreRobustThanYou/patch-60
...
Fixes SCP-294 losing its top sometimes
2018-02-16 00:24:15 +02:00
0195f03435
[s]Fixes writing bugs/exploits ( #35552 )
...
* literacy crisis
* cleanup
2018-02-16 11:09:16 +13:00
ad7fc7417c
Added chemical reaction unit tests ( #35478 )
...
* Added unit tests for reagent recipes
* Renamed recipe_collisions unit test to reagent_recipe_collisions
* Fixed chemical conflict unit test temperature logic
* Made chemical reactions always choose the reaction with the most extreme temperature requirements if there are multiple possible reactions
2018-02-16 09:34:08 +13:00
00766b755a
- Sorry I don't know how to rename branches this was gonna be soapstone related
2018-02-15 19:43:45 +01:00
8945337ec5
I feel like morphine!
2018-02-15 15:36:35 +00:00
6ebea3ac6c
Slime Radio Potion ( #35548 )
...
* Slime Radio Potion
* Deletes inaccurate comment
2018-02-15 12:37:20 +02:00
bf2018b215
Fixes SCP-294 losing it's top sometimes
2018-02-14 16:08:18 -05:00
04a1a9e595
fixes lye/plastic/charcoal conflicts
2018-02-11 16:01:22 +01:00
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
61fd8fecbc
Buildable and upgradable All-In-One Grinder ( #35451 )
...
Circuit is in "Biological Processing" techweb node
2018-02-10 19:00:06 -05:00
53422e4088
Adds a SCP-294 ruin ( #35188 )
...
* Add a SCP-294 ruin
* Convert map to TGM
* Add hostile mobs, random traps
* Add nanites
* Now now, we don't wanna blow ourselves up, do we, Jimmy?
* Blacklist blob chems
* make it harder
* Remove statue; use can_synth; name finder
* Fixup scp_294.dmm
* Fix traps
* Fix traps
* Add to POI list
* TGM-ize
* ruin remap
* damn tags
* Re-add mimics and traps
* New sprites by @militaires!
* Fix trap spawners spawning ctf protection thingys
* map fixes
* New sprite!
2018-02-10 18:39:27 -05:00
f5ff686404
Merge pull request #35424 from ShizCalev/var-cleanup
...
Replaces some var values with defines
2018-02-10 12:10:40 -05:00
99c1a11e5d
Merge pull request #35479 from Cruix/chem_collisions
...
Fixed chemical recipe conflicts
2018-02-10 12:04:18 -05:00
7470e79c2c
Switched nitrogen for ethanol in morphine recipe. ( #35437 )
...
* Fixes Ordo not testing shit properly
* Lowers yield for balance purposes
Fug
2018-02-10 11:00:01 -05:00
f7fe600540
Cleans up vars with defines
2018-02-09 00:20:41 -05:00
a524466853
Fixed chemical recipe conflicts
2018-02-08 19:36:11 -06:00
718e50548e
true/false
2018-02-08 11:16:20 +01:00
6c0f6fbf4a
Prevents fungal TB spores from being synthesized ( #35381 )
...
* can_synth 0 for fungal TB
* 0 -> FALSE
2018-02-07 12:57:01 +02:00
a12f4491aa
[READY]Explosive Hot Potatoes - Service department job restricted traitor item ( #34741 )
...
* Hot Potato!
* Hot Potato!
2018-02-06 08:37:25 -05:00
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
9348ad9aad
Fixes bloodpack sprite issues ( #35288 )
...
* Fixes bloodpacks with question marks
* .
* .
* .
2018-02-05 20:21:13 -05:00
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
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
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
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
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
1aef06f9e5
Removes ketrazine
...
bye felicia
2018-02-01 22:47:15 +00:00
418a8c0112
Cult Update ( #33810 )
...
* Cult overhaul
2018-01-30 21:59:03 +02:00
b8836913cc
Merge pull request #35087 from nicbn/bloodpack
...
Adds greyscale filling for bloodpack
2018-01-30 10:12:52 -05:00
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
d679d7bee1
Uses the new trait system on some chems ( #34893 )
...
* Uses the new trait system on some chems
2018-01-29 16:44:40 +02:00
3ecf74f1fd
Xenobiology consoles can now scan slimes and apply potions ( #34748 )
...
* Xenobiology consoles can now scan slimes and apply potions
* no smack
2018-01-29 10:59:13 +01:00
8739e68b07
Merge pull request #34988 from XDTM/SayNoToNuclearNerfs
...
Replaces pax in PK borgs with a version that expires faster
2018-01-28 23:39:47 -05:00
b19975b3fb
Adds greyscale filling for bloodpack
2018-01-28 23:03:07 -02:00
740c4a0337
Adds firefighting foam, a better alternative to water for fighting fires. ( #34788 )
2018-01-26 22:16:32 +02:00
836d3ba8b6
Replaces pax in PK borgs with a version that expires faster
2018-01-26 20:07:36 +01:00
007b8b86f6
Syringe update_icon sanity
2018-01-25 22:50:59 -06:00
6f3c4473c0
Merge pull request #34881 from Robustin/paxPK
...
Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
2018-01-25 22:49:29 -05:00
80a4e051f2
Someone fucked up
2018-01-24 19:26:55 -05:00
e28ba6d8c3
Fix old usages of trait introduced by the trait merge
2018-01-24 20:48:23 +00:00
5a08a3aad0
Extends the disability refactor to include more traits, removing some snowflake code ( #34664 )
...
This way you can add/remove traits without fear of other sources overriding them. Now you can add TRAIT_STUNIMMUNE to somebody without what if hulk
Notable changes:
Fakedeath now updates instantly, instead of waiting for the next life tick.
Fakedeath now sets time of death when acquired.
Removed extremely snowflake code in reagents that checked if you had morphine to remove slow immunity and so on.
Hulk no longer overrides status_flag changes, in case there are any.
2018-01-25 09:12:44 +13:00
f80a54b0ff
Adds Ketrazine, a powerful combat stimulant with severe side-effects which can be synthesized by the crew ( #34579 )
...
🆑 Ordo
rscadd: Adds Ketrazine, a powerful but dangerous combat stim which the crew can synthesize
/🆑
2018-01-25 09:07:34 +13:00
b7c57470e6
Adds stutter to narsour
2018-01-24 12:56:14 -06:00
4daa1e5ebf
Adds the narsour
2018-01-24 12:56:14 -06:00
08f37fbaa9
Adds Pax to PK Hypo
2018-01-24 13:17:34 -05:00
3f10f29d5b
Shifts vars off /mob and to the correct subtype ( #34773 )
2018-01-24 15:58:42 -02:00
4f28e3ef3a
Puts beakers in your hand on eject ( #34787 )
2018-01-24 01:28:23 -05:00
Jordan Brown
vuonojenmustaturska
ShizCalev
Cruix
BordListian
FrozenGuy5
KorPhaeron
MoreRobustThanYou
Denton
Mokiros
Ordonis
ShizCalev
kevinz000
coiax
nicbn
Incoming5643
Robustin
oranges
XDTM
BordListian
GuppyLaxx
Dax Dupont