Commit Graph

2426 Commits

Author SHA1 Message Date
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
Mokiros
61fd8fecbc Buildable and upgradable All-In-One Grinder (#35451)
Circuit is in "Biological Processing" techweb node
2018-02-10 19:00:06 -05:00
MoreRobustThanYou
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
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
Jordan Brown
99c1a11e5d Merge pull request #35479 from Cruix/chem_collisions
Fixed chemical recipe conflicts
2018-02-10 12:04:18 -05:00
Ordonis
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
ShizCalev
f7fe600540 Cleans up vars with defines 2018-02-09 00:20:41 -05:00
Ian Turk
a524466853 Fixed chemical recipe conflicts 2018-02-08 19:36:11 -06:00
81Denton
718e50548e true/false 2018-02-08 11:16:20 +01:00
81Denton
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
kevinz000
a12f4491aa [READY]Explosive Hot Potatoes - Service department job restricted traitor item (#34741)
* Hot Potato!

* Hot Potato!
2018-02-06 08:37:25 -05: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
nicbn
9348ad9aad Fixes bloodpack sprite issues (#35288)
* Fixes bloodpacks with question marks

* .

* .

* .
2018-02-05 20:21:13 -05: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
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
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
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
oranges
1aef06f9e5 Removes ketrazine
bye felicia
2018-02-01 22:47:15 +00:00
Robustin
418a8c0112 Cult Update (#33810)
* Cult overhaul
2018-01-30 21:59:03 +02:00
Jordan Brown
b8836913cc Merge pull request #35087 from nicbn/bloodpack
Adds greyscale filling for bloodpack
2018-01-30 10:12:52 -05: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
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
XDTM
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
Jordan Brown
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
nicbn
b19975b3fb Adds greyscale filling for bloodpack 2018-01-28 23:03:07 -02:00
BordListian
740c4a0337 Adds firefighting foam, a better alternative to water for fighting fires. (#34788) 2018-01-26 22:16:32 +02:00
XDTM
836d3ba8b6 Replaces pax in PK borgs with a version that expires faster 2018-01-26 20:07:36 +01:00
ShizCalev
007b8b86f6 Syringe update_icon sanity 2018-01-25 22:50:59 -06:00
Jordan Brown
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
GuppyLaxx
80a4e051f2 Someone fucked up 2018-01-24 19:26:55 -05:00
oranges
e28ba6d8c3 Fix old usages of trait introduced by the trait merge 2018-01-24 20:48:23 +00:00
XDTM
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
Ordonis
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
Robustin
b7c57470e6 Adds stutter to narsour 2018-01-24 12:56:14 -06:00
Robustin
4daa1e5ebf Adds the narsour 2018-01-24 12:56:14 -06:00
Robustin
08f37fbaa9 Adds Pax to PK Hypo 2018-01-24 13:17:34 -05:00
ShizCalev
3f10f29d5b Shifts vars off /mob and to the correct subtype (#34773) 2018-01-24 15:58:42 -02:00
Dax Dupont
4f28e3ef3a Puts beakers in your hand on eject (#34787) 2018-01-24 01:28:23 -05:00
MrDoomBringer
20a6c0cdd7 Adds ~70 more suicides (#34522)
Does what it says on the tin, probably a terrible idea
2018-01-23 20:38:31 +13:00
XDTM
13cc69e407 Adds a few jelly reagents, small chem adjustments for slimepeople (#34524)
🆑 XDTM
add: Added Regenerative Jelly, made with tricordrazine and slime jelly. It regenerates a bit faster, and won't harm jellypeople.
add: Added Energized Jelly, made with teslium and jelly. It works as an anti-stun chemical for slimepeople and speeds up luminescents' power cooldown, but non-jellypeople will just get shocked.
add: Added Pyroxadone, made with cryoxadone and slime jelly. It's basically inverse cryoxadone: it heals faster the hotter your body temperature is.
tweak: Cryoxadone no longer deals toxin damage to jellypeople.
tweak: Purple Slime Extracts no longer have their sugar->slime jelly reaction (obsolete with extract grinding), and instead have a blood->regen jelly reaction.
tweak: Purple Extract's major activation by Luminescents now give regenerative jelly instead of tricordrazine.
/🆑

Gives a better purpose to purple slimes, makes slime jelly something nice to give to chemistry for improved healing, and makes it so luminescents no longer kill themselves with cryoxadone and tricordrazine.

Also reduced the amount of frost oil given to luminescents in dark blue's activation, so they match cryoxadone's duration.

Fixes #34517
Fixes #34539
2018-01-23 20:36:50 +13:00
vuonojenmustaturska
6406896df1 Replaces a bunch of obj vars (and emagged on machinery/items) with obj_flags (#34078)
* It works, but is it worth it?

* bitfield helpers take 1

* Would this work?

* remove dangling debug code

* rebase & fixes

* vv bitfield stuff, reading

* DNM oceans of shitcode DNM

* honk

* honk2

* plonk

* rebase & fix
2018-01-22 20:19:46 +01:00
ShizCalev
d504c7e3db Fixes syringe icons (#34704) 2018-01-22 15:06:07 +01:00
BordListian
23a2c6ecc6 - Changes gas reagents (liquid plasma, oxygen, etc) to emit gas based on chem temperature instead of at room temperature when dumped. (#34515) 2018-01-21 02:04:31 -06:00
BordListian
b1dfa4f140 - Fixes smoke and foam having 1/4th of the reagents they should have (yoooo)
- Fixes copy_to runtiming if you transfer from a container that contains nothing directly to a reagents datum
- Removes redundant total_volume check in trans_to
- Fixes cryostylane and pyrosium not heating up people
- Fixes cryostylane cooling beakers to negative kelvins
- Fixes cryostylane cooling people to negative kelvins (stop copypasting code for temperature)
2018-01-21 02:01:23 -06:00
ShizCalev
e72fa68f2a Fixes missing MakeSlipper() args 2018-01-19 15:09:55 -05:00
Joan Lung
b30e2934e7 Moths, except I have stolen them and they no longer conflict (#34498)
* Moths, except with less conflicts

* if I remove your wings, will you die?

* it would be extremely painful
2018-01-19 10:32:22 -05:00
AnturK
e38e6b8fa4 Antag Panel / Check antagonists Refactor (#34236)
* Antag Panel & Friends Refactor

* Prettfying

* Removes abduction also blob from default configs.

* Ninja fixes

* Ninjafix

* First draft of the new check_antags

* I love coding without compiler

* Yes

* Fixes

* Check_antags part  2

* Fixes and cleanup

* Okay should be good now.

* Adds simple no move & no tc syndie for events

* Integrates toggle objective pr

* Why i even bother.

* Offer mob shows all antags

* Some minor visual stuff

* Proper name for the helper
2018-01-19 09:43:23 -05:00
Robustin
15864dc567 Temperature Refactor and Fixes (#34133)
* Low temp no longer a death sentence

* Default bodytemp added

* Updated bodytemp defines

* Added bodytemp defines

* Cryo Oil sanity check

* Bodytemp refactor

* Bodytemp refactor

* Mob Temp Refactor

* Mob Temp Refactor

* Update life.dm

* Update food_reagents.dm

* Update species.dm

* Update species.dm

* Update species.dm

* Update atmospherics.dm

* Fixes
2018-01-19 15:40:09 +01:00
Jordan Brown
8bde56fd5a Merge pull request #34553 from ShizCalev/abstract-transfertoloc
Fixes being able to place abstract items in fridges & chem dispensers
2018-01-18 17:47:48 -05:00