* adds capitalism firing pin for late-stage capitalism
* purchase prompt so you can't bankrupt the captain with a rigged gun
* prompt spam check, cargo crates for pins, extra warning message for accepting payment but not having enough to pay out
* test stuff please ignore
* pay-per-shot system, alert instead of input, minor cleanup
* fuck off clown
* range check to prevent long-range purchasing
* Gets rid of double processing memes.
* fixes the organ box thing
* Makes everything just a tad more performant
* even more performant
* Gets rid of the double processing on SSobj for body eggs
* forgot the brackets
* Also removes double processing memes from the shadowling armblade
* Removes the istype check for MMIs.
* megumin is best girl fucking fight me
* what kind of smoothbrain capizalized these
* uses explosion defines
* more explosion defines
* Removes reagent explosion code for <1 amounts
* Scales explosion knockdown off bomb_armor
About The Pull Request
Fixes a couple of issues related to window construction introduced by the tougher windows PR.
Also gives plastitanium and shuttle windows matching values to reinforced and plasmawindows like I intended to on the last PR.
Why It's Good For The Game
fix
Changelog
cl
fix: newly constructed reinforced windows start in the correct state, meaning they can be disassembled
fix: crowbar can no longer be used out of order on construction
fix: screwed down but not levered in windows can be unscrewed again
tweak: shuttle and plastitanium windows now have the proper values to match reinforced windows.
/cl
* Quarantine module now has teeth
* Quarantine applies to everyone
* typofix and more genericness
* Legal clarification
* Rules lawyering
* Rule 1 friendlier version
* refactor wip
* rerolling and qol
* space not valid
* travis be nice
* comment?
* new tablet sprites
* Start on uplink screen
* new suit sprite
* paper
* merge conflict
* Auto stash before merge of "contract-reroll" and "tgstation/master"
About The Pull Request
Changes our current underwear selection to greyscale so you can color them any way you like, just like hair.
Removed duplicate underwear types that only served as a few color options(female_yellow, male_blue, ect.) Underwear with designs are unaffected(female_uk, male_commie, ect.)
Added a new option in dressers to change underwear color.
Changed some underwear names to fit the new option(female_red is now female_lace, ect.)
A9hAqkxgin
If all is well i plan on adding this to undershirts and socks too.
also HUGE thank you to nonfictiongames for the help!!!!
Why It's Good For The Game
More character customization in roleplaying game GOOD
Changelog
cl
add: Underwear can now have any color. (Your character will most likely be nude now so check your prefs!!)
add: Underwear color option in dressers
tweak: changed some underwear names
imagedel: deleted duplicate underwear
/cl
About The Pull Request
full tile Reinforced windows now require a melee item over 11 damage to damage, have 150 health, and 90 melee armor. This is approximately 2 minutes of sustained beating with a toolbox.
full tile reinforced Plasmaglass windows now require a melee item over 21 damage to damage, have 200 health, and 95 melee resistance. This is approximately 3 minutes of sustained beating with a toolbox.
dir windows have been given the appropriate halved health values.
Current deconstruction steps:
heat one way screws (welder, 18 seconds, harm intent required)
unscrew one way screws (screwdriver, 8 seconds)
pop out panel (crowbar, 5 seconds)
cut connecting bars (wirecutter, 3 seconds)
unbolt frame (wrench, 5 seconds)
theoretical fastest time: 39 seconds
more practical time: 45 seconds
if the bolts are heated and then not unscrewed within 30 seconds they cool off again, and must be heated again
Construction is the same as before except the crowbar levering step takes 10 seconds instead of 3.
Why It's Good For The Game
Getting into places you shouldn't be is currently way too easy.
This change forces you to hack in, disassemble the window, or target a weak point like a windoor.
At the moment, it is possible to smash down what is intended to be a secure window with an item you get in your bag at roundstart for free. This is stupid. It should require some planning or at least thinking to be able to make your way in places you should not be.
Oranges has talked in the past about departments being designed like impenetrable fortresses with shutters everywhere, and this happens because reinforced windows are far too weak and unreliable to be able to have as effective defense of any department against even underequipped and underprepared people. This leads to the introduction of shutters which are too strong and difficult to deal with in most cases.
This is part of some plans to make departments more secure overall while still providing ample avenues for determined or properly prepared individuals able to get in if they want to. Despite having more plans along with this, this is a standalone change as is. This is not a "this will only work with later changes I'm totally going to do" situation
Changelog
cl
balance: Reinforced windows now require a melee item over 11 damage to damage, have 150 health, and 90 melee armor. This is approximately 2 minutes of sustained beating with a toolbox.
balance: Plasmaglass windows now require a melee item over 21 damage to damage, have 200 health, and 90 melee resistance. This is approximately 3 minutes of sustained beating with a toolbox.
/cl
* rebase branch
* Revert "rebase branch"
This reverts commit 72e70fe8ccabfa6c750193a57beeec14b30a2533.
* Updated this old code to fork
* gives the clown hugbox
* Clown gets hugbox back
* Removed new boxes, changed box code
* Sorted line spaces
* Removed sauce
* adds "you" to some combat visible_messages.
* more you-messages and attack verbs to present tense.
* small fixes
* more additions and small fixes
* few message tweaks
* Fixes a typo and few other wordings.
* Adds a GPS component. Megafauna no longer needs gps implants.
* Removes commented out code.
* Removes the last internal radio
* I was already wondering why the diff was so small
* Removes/Moves some weirdly placed variables in martial arts. Splits NO_GUNS and CHUNCKY_FINGERS traits.
* Maybe this should actually compile
* c begone
* The map itself
I hope it won't PR on /tg/station immediately.
* ok lavaland monster dmi thank you
"bruh you added two sprites oh shit im about to m-m-m-malfuncti-" *BOOM*
* cabin building stuff
Still need to merge master.
* Ninja's uniform PR got merged.
Good thing I used, like, only one jumpsuit for the entire map. I hope this merges before someone changes winter coats though.
* lmao
* MrDoomBringer forgot a few things
obj/iced_abductor. that's an ayy lmao moment.
Besides that, the block should work. Just don't destroy it before the round begins otherwise you see this: https://i.imgur.com/K3GGnqy.png
Proof that this works: https://i.imgur.com/MxVO0Og.png
* no more claustrophobic medbay
It doesn't look as good as I want it to. It also feels way too fucking cramped.
About The Pull Request
machines and consoles that previously required an inserted ID now check access on worn and inhand ids. They otherwise function identically.
Affected things:
ORM: click claim to claim cash to connected ID (also fixes it)
Mining vendor: uses ID on person or in hand.
medical console: checks worn ID
security records console: checks worn ID
gulag consoles: claim points to worn ID, checks access and point requirements from worn ID
Also some backend refactoring to prisoner management and gulag teleporter consoles
hop console will be next to strip out the shitcode entirely but this at least gets things functional in the mean time, but fully tested this time. It's very late here and I need to sleep. Due to the nature of it it's more elaborate of a rework.
Changelog
cl
tweak: Medical and Security consoles now check access on worn or inhand ID instead of requiring an inserted ID
tweak: mining vendor now reads from ID in hand or on person instead of requiring an inserted ID
fix: ORM is functional again (for real this time)
tweak: ORM claim points button transfers points to worn/inhand ID instead of to an inserted ID, no longer accepts insertions
tweak: Same for gulag consoles
/cl
