Commit Graph

570 Commits

Author SHA1 Message Date
Lucy
a50cbe7281 auxtools and katmos! 2021-12-17 17:59:11 -05:00
KittyNoodle
7a203d44e0 Locks flamethrowers behind makeshift weapons (#12769)
* Locks flamethrower behind makeshift weapons.

* Actually locks it
2021-12-11 16:04:48 +00:00
Marmio64
b138386f14 4 new traits + some trait rebalancing (big) (epic) (clickbait) (#12759)
* new traits + trait balancing

on average point values doubled to allow for more middleground traits, voracious tagger photographer musician spiritual and friendly have lower costs since they dont give you yourself much benefit while paraplegic and blind give more points due to how debilitating they are. adds hemophiliac, efficient metabolism, crafty, and cyberorgan.

* empath cost lowered to 1

it has no powergame use or really much use at all since nobody uses mood anyhow.
2021-12-11 16:02:00 +00:00
Marmio64
b822566944 more resin changes, tribal healing changes (#12741)
polypore resin count upped to 5 units instead of 3. resin solidifies from water rather than heat. removes tribalordrazine, tribal poultice recipe changed to be that of tribalordrazine. modifies tome of herbal knowledge to reflect changes. adds resin armband. reduces sinew price of chitin spear to 3 from 4. adds tribal bone gel made from gutlunch honey and liquid resin
2021-12-11 16:01:36 +00:00
Lucy
dcab94dbc0 Stand-o-rama - rebalances a bunch of holoparasite stuff (#12774)
* Stand-o-rama!

* Fix ESLint stuff

* Dust on death.

* minor code tweaks

* Fix spans

* use defines to make bibby happy

* whatever there'll only be one anyways
2021-12-09 19:43:08 +00:00
Byemoh
6bc38339f1 Fixes two bugs with grilling/griddles (#12804)
* Update griddle.dm

* we grill now
2021-12-06 07:04:33 -05:00
Lucy
84ff9c6d50 Infiltration game mode (#12270)
* Infiltrators!

* Fix the cigarette vending machine in the infiltrator base

* Uncomment role preference

* Fix a bunch of bugs.

* Changes to AI hijack

* GODDAMIT I FORGOT TO SAVE IN STRONGDMM

* Fix the dumb gravgen runtime.

* Just throw the infiltrator base on centcom directly

* Add infiltrators to one-click antag (and fix vampires not being in it)

* blame jamie

* add infiltrators event

* Admin only for now.

Admin only for now.

* Maybe fix the round ending a BIT too early?

* Fix uplink not appearing properly in the roundend report

* Improve examine text for infiltrator power sink

* Whoops, remove the J

* More stuff.

* Jamie's map changes

* Make the AI hijacker more idiot-proof.

* Update map again.

* fix infiltrators not being able to use edaggers

* Update centcomm map again

* aaaaa

* fix powersink examine

* e

* wait nvm that's right

* big typo whoopsie

* Some big ol' improvements!

* some tweaks to infiltrator uplink items

* Use span defines, some hijacked AI stuff...

* infiltration implants! woohoo!

* fix pinpointer to objectives not working

* dammit actually fix the pinpointer

* New pinpointer sprite!

* new sprites!

* Finishing all objectives no longer finishes the round.

* Fix sprite

* fixy fixy

* you can now put TC into your uplink

* restrict holoparas for infiltrators

* Fix infiltration implant creating a bugged implant case

* Fix CTF; add another infiltrator item spawnpoint

* tweak shuttle a bit

* you can no longer hijack dead AIs; 3rd item spawnpoint is now on the shuttle

* prevent using PDAs to metagame

* no removing purrbation

* hijacked ais can no longer doomsday; infiltrator objectives now properly respect quiet round

* make kidnap code slightly better

* show to ghosts

* remove cornered donuts in infiltrator ship

* fix up objective code stuff

* fix telecrystal thing still not working

* Add to config

* add minimum age of 3 weeks; add dynamic ruleset copy-pasted from nukies

* nvm i'm too lazy to figure out how this works

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-12-04 17:42:36 -05:00
Marmio64
6ad7aa0631 ashwalker - the resin expansion (#12607)
* ashwalker resin expansion

* resin statue

* Update code/modules/reagents/chemistry/recipes/others.dm

Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>

* fix?

* makes statue look a tiny bit better

* resin slightly less dangerous and less rng dependant, fixed statues

Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2021-11-14 18:02:07 +00:00
Byemoh
6fe6f6199a [PORT] [READY] Kitchen Rework part 1: I just want to griddle! (#12533)
* let the man grill

* remove multiplier since you get bonus stuff from upgrades anyway

* the maps

* changes things made with protein nutriment to be have protein

* rest of the maps
2021-10-31 13:21:45 +00:00
N3D6
dfe5391b60 Adds meson sunglasses, makes the CE spawn wearing a pair (#12481) 2021-10-31 12:52:58 +00:00
Byemoh
1dc58d06b3 Changes borg buckling delay from 1.5 seconds to 0.75 seconds, adds a 1 second delay to *spin with included chat and audio tells (#12223)
* removes 1.5 second delay

* changed timer from riding to flinging + sounds

* oppresses borgs again

* Update riding.dm

* Update robot.dm

* Create robot.dm

* Update robot.dm

* Update robot.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-10-17 10:49:36 +01:00
Maxim
41e58e7099 Ports Automatic Station Stabilizer Bots from Bee (ASSBot) (#11708)
* adds atmosbot

* did a thing

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

he's right :(

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* updates crafting time to six seconds (complex bot time)

* changes robot name thanks to alexkar

* changes the recipe name

* Update atmosbot.dm

* REMOVES OLD ATMOS BOT, REPLACES WITH NEW SUICIDE BOT (TM)

* linter pls stop be angry

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2021-10-15 10:25:20 -04:00
Redmoogle
1074be5011 Cleans up some do_after calls (#12417)
* Replaces do_after delays with defines instead of deciseconds

* Fixes Text
2021-10-09 01:18:35 -04:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
Theos
26191754f1 Ports wounds from TG (#11955)
* piss

* second set of files

* theos feels pain and dies

* code works lmao

* other stuff

* YES YES YES

* Update zombies.dm

* egg

* whoops

* bubblegum alt attacks won't wound

* bone hurting juice hurts bones

* something's fucky wucky

* humans are no longer blue space babes but projectile damage is still wack

* IT WORKS???????

* other stuff

* turns out im big brain and already handled that should be testable live now

* WHOOPS

* medical pens not in stupid area

* fix regen mesh icons

* tool_behavior and defines plus allowing wound healing to override surgical tool no touchy bit

* should help

* mapping problem

* fix monkies shitting out blood all the time

* going to remove examine_more being stupid

* this is stupid i think it works though

* Empty commit, more bad code

* this probably fdixes something

* buckshot buffed back to where it should be

* woundings

* missed this one

* fix gamebreaking bug

* turns out damaging ANYTHING causes suit sensors to break whoops

* stuff up to limb disable refactor

* aid scanner can no longer kill you if you use it too much, preventing the robot uprising for another few decades

* Update burn_dressing.dm

* wtf

* shotgun slugs have a wound bonus of -30 putting them in line with other high damage weaponry that has even less

* burn debriding uses the scalpel rather than the hemostat

* debriding for patch/treat no longer causes wounds

* Give syndicate medical cyborg a bonesetter

* like 5 more prs ported

* fixes burn ointment and mesh application not having a progress bar

* gamemode zombies get easydismember and easily wounded

* managed to screw up self cautery this fixes it

* carbons can't use check self for injuries but humans can

* honey gives +2 sanitization to burns

* re-add this if sensors get fixed

* should fix a runtime I made on accident when trying to make examine more less jank

* last 2 prs and some holdup fixes since these touched on that

* set target = src so the progress par shows up i think

* Update mutations.dm

* fixes twohanded reuqired weapons by reverting some change I don't understand

* fixes blood sprites

* actually properly fixes the thing

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-11 13:19:11 +01:00
Marmio64
25e4409341 Space dragon carp suit (#12021)
* carp dragon suit

* darker

* new sprites by Salla
2021-08-31 14:35:14 +01:00
Jamie D
bd4b315426 10 Second Cooldown to Borg Spin - Prevents Stunlocking (#11798)
* Update riding.dm

* Update riding.dm

* E

* Update code/datums/components/riding.dm

Co-authored-by: Theos <theubernyan@gmail.com>

* Update code/datums/components/riding.dm

* Update code/datums/components/riding.dm

* Update code/datums/components/riding.dm

* Update code/modules/mob/living/silicon/robot/robot.dm

Co-authored-by: Theos <theubernyan@gmail.com>
2021-07-31 14:40:01 -04:00
TheGamerdk
c0d8fd33c8 Update recipes.dm (#11868) 2021-07-24 12:26:00 +01:00
TheGamerdk
46a75795c6 Update bag_of_holding.dm (#11818) 2021-07-20 18:53:46 -04:00
adamsong
0816f16f10 BoH bombing the bluespace locker no longer bombs the outside of the locker (#11682) 2021-07-02 06:07:56 -04:00
Maxim
607309762b You no longer need to steal an entire paper bin to make paper frames. (#11636)
Changed crafting recipe for paper frames from 5 planks and 20 paper to 5 planks and 5 paper, to get five frames.
2021-07-01 10:25:36 +01:00
Marmio64
ec0488bc2f borg spin nerf (#11504)
turns borg spin stun into knockdown
2021-06-01 12:45:09 -04:00
Theos
f192e9c563 balanced (#11506) 2021-05-26 05:37:50 -04:00
Theos
3c40c49aa5 holdup now won't force trigger on the target moving (#11426)
* whoops

* Update gunpoint.dm
2021-04-28 03:08:58 -04:00
Xoxeyos
fe8d3b7a1a Makes it more difficult to meta heretics with kitchen knives (#11313)
* Update kitchen.dm

* Update recipes.dm

* lets try this

* lets also try this for shanks

* updates the shank sprite

* No longer needs a welder

* Delete items_righthand.dmi

* Delete items_lefthand.dmi

* inherited bit

* Update recipes.dm

Co-authored-by: Theos <theubernyan@gmail.com>
2021-04-24 16:12:08 -04:00
Theos
d7d7ce59c5 Makes holdup more viable (#11286)
* cleans up holdups a bit and makes them react to disarms

* increases delays very slightly to account for the immobilize increase

* Update gunpoint.dm

* Update gunpoint.dm

* Update gunpoint.dm

* Update gunpoint.dm
2021-04-10 12:37:54 +01:00
Theos
8370385457 ports crystallizer from TG (#11222)
* ports crystallizer with some other changes

* Update atmos_grenades.dm

* Update atmos_grenades.dm

* how the fuck

* haven't seen anyone even make zauker

* Update atmos_machines_recipes.dm
2021-03-27 15:57:34 +00:00
Theos
eaff0be9c6 fixes buckling layer offsets (#11148) 2021-03-16 08:56:32 -04:00
Redd
12cc218350 Update tailoring.dm (#10927)
Co-authored-by: Redd <breadisredd@gmail.com>
2021-01-26 16:37:52 -05:00
jcatjmeow
690826be97 e (#10887) 2021-01-16 13:23:43 +00:00
Redmoogle
b81da5826d Convert from deci to seconds (#10810) 2021-01-07 13:47:55 +00:00
Redmoogle
dc53b9edfb Port (#10699) 2020-12-23 19:00:49 +00:00
Redmoogle
f5a06b5e3c Fixes 2 bugs with blastdoor crafting (#10657)
* last minute mistake fixes

* parent call
2020-12-15 23:21:23 +00:00
Magicut101
f9502eac74 Adds A Bone Pickaxe (#10427)
* Update uplink_items.dm

* Adds A Bone Pickaxe to the Tribal Tab in crafting

* Delete uplink_items.dm

* done

* Update yogstation.dme

* Revert "Update yogstation.dme"

This reverts commit f27bbdcba9.

* fe

* picture

* Update recipes.dm

* Update code/modules/mining/equipment/mining_tools.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update mining_tools.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: Jcatjmeow <40673387+jcatjmeow@users.noreply.github.com>
2020-12-12 14:20:43 +00:00
Redmoogle
b238e39876 Constructable & Linkable Shutters/Blastdoor + Mini-Refactor (#10548)
* Shutter Linking + Shutter Crafting + Mini-Refactor

* Some Fixes

* Add Deconstruction

* Bibby goes ham on pr

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* defstrng

* Leftover code accident

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2020-12-04 19:08:11 -05:00
Jamie D
90aee25dbf I hate radiation and stupid things, new admin button to fix it and cleanable overhaul (#10544)
* REEEEEE 6 Hours

* EEEE

* Runtime1

* Linter brr

* e

* LINTER

* Creamy Goodness

* REEEE
2020-11-30 18:25:54 +00:00
Redmoogle
28550fcce3 RCD Overhaul/Major Port (#10464)
* YEEHAW

* You're not you when you code for 3+ hours

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Fix airlocks

* Fix firelock blocking door construction

Co-authored-by: Hopekz <hopekxx@gmail.com>
2020-11-30 18:24:52 +00:00
Jamie D
b14ed50dc5 eek (#10528) 2020-11-29 11:36:19 +00:00
Jamie D
d0cef42e36 Huge Atmospherics Update - Five layer pipes and new funny gases (#10447)
* AHHHHHHHHHHHHH

* oopsie

* Fucking extools, who would of guessed

* eee

* MAPS GO BRRRRR

* Icons

* Update code/modules/atmospherics/machinery/portable/canister.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/game/objects/items/grenades/atmos_grenades.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/atmospherics/gasmixtures/gas_mixture.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* More shit

* Update basemats.dm

* Cock and Balls

* oh my god kill me please I hate gases and colton is a slave master someone call the cops he is after me and I dont feel good. I need some help here because I dont know what im doing and im very scared.

* Fuck off linter

* HMMMMMMMM

* Hmm?

* afasggsag

* REEEE

* COMPI:E BAD

* Hmmmm

* icons maybe

* T mixer

* Icons

* Ree

* Please work

* Fucking yogs folder

* Reeee

* Icon and runtime

* Reee

* Indents

* MIXER GO BRRR

* E

* Last update of the night

* oopsie

* Linter go Brrr

* REEE

* MOre fixes

* e

* Electroshitter

* EEE

* FUCK

* Maybe makes this work

* tg bad

* Come at me linter.

* Fucking oops

* Update electrolyzer.dm

* LINTER GO TO HELL - GIMMIE DAT GREEN TICK

* Im dumb

* E

* Update electrolyzer.dm

* Fixes vents

* Fixes

* E

* Fucking Jank code is jank

* R

* r

* Update tgui.bundle.js

* fucking moja just used goddamn find and replace

* Theos

Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: Theos <theubernyan@gmail.com>
2020-11-26 20:54:29 +00:00
Theos
eb891c78e9 theos does something really smart and prevents gibs from rotting if they are on a tile that has planetary atmos (#10454)
* theos does something really smart and prevents gibs from rotting if they are on a tile that has planetary atmos

* Update rot.dm
2020-11-22 16:27:15 +00:00
Theos
5926afcd31 probably fixes runtime in crafting.dm (#10440) 2020-11-19 09:17:30 +00:00
Wayward Horizons
a4ad6615a5 Rebrands the personal closet recipe as the secure closet (#10387) 2020-11-11 14:16:45 -05:00
Jamie D
98508e8302 Runechat 1.1 - TG Edition (#10318)
* RUNECHAT UPDATES

* Fixes hologram speech hopefully.

* Update ai.dm
2020-11-04 18:28:54 +00:00
Marmio64
590ccc1126 chitinspear (#10277)
call it a spear or naginata, whatever
2020-11-01 19:35:58 +00:00
Nichlas Pihl
6e66e64e38 Corporations II: Adds corporate discounts to the traitor uplink (#10197)
* Adds corporate discounts to the traitor uplink

* Actually adds the manufacturing
2020-11-01 19:13:57 +00:00
Jamie D
e9c958fb11 Revert "Revert "TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler"" (#10254)
* Revert "Revert "TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler (#10207)" (#10252)"

This reverts commit c936816e14.

* FIXES NO BUTTON PRESS BS
2020-10-29 22:15:01 +00:00
Jamie D
c936816e14 Revert "TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler (#10207)" (#10252)
This reverts commit 38f3174826.
2020-10-29 19:54:16 +00:00
Jamie D
38f3174826 TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler (#10207)
* Im sleepy

* Reee

* oopsie Linter go brrrr

* Update code/datums/components/storage/concrete/bag_of_holding.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/controllers/subsystem/air.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-29 19:28:57 +00:00
Jamie D
10c9af0d77 Material datums - Moogle Helped - Check #10169 for more info (#10176)
* Hmm

* work please

* Fixes

* Ack

* REEE

* EEEE

* e

* e

* e

* STAND FIX

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-28 17:53:59 +00:00
Theos
eb405184bc add pathfinder gear craftable from fauna bits, should provide ashproofind and decent armor (#10063) 2020-10-27 09:49:18 +00:00