Commit Graph

12282 Commits

Author SHA1 Message Date
Twaticus
9dfa78cb47 Underwear color (#45630)
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
2019-08-09 11:04:58 +12:00
Rob Bailey
a5de1c1b5e [READY] Reinforced windows are harder to get through (#45609)
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
2019-08-09 11:03:59 +12:00
Akrilla
c9c57c4419 Small cigarette refactor and Syndie cigs more viable for healing (#45711)
* cig

* price

* back to 2

* smoke all
2019-08-08 02:10:53 -07:00
William Wallace
153e0d0250 Footprints no longer always face south and can rotate properly (#45752)
* footprints no longer always show south-entering prints

* footprints can be rotated without breaking

* return consistency
2019-08-08 01:48:24 -07:00
81Denton
7b8579c17a Minor ghost notify changes (#45759) 2019-08-08 01:47:04 -07:00
Arkatos1
c638de2370 Init fixes (#45762) 2019-08-08 01:07:33 -07:00
nemvar
b9fa7963a7 Moves the C4 overlay to the float layer for mobs. (#45754)
* Fixes C4 stuff

* Only does it on mobs.
2019-08-08 01:02:57 -07:00
nemvar
269c7666fc Nerfs reinforced bolas (#45622) 2019-08-07 16:00:34 -04:00
zxaber
532a891b74 Mediborg Beaker Storage Apparatus (#45494)
* Pull request commit apparatus

* words

* better comments

* small bits

* beaker breaker

* better beaker breaker

* Superior Signals

* new signals for update_icon

* compile_overalys
2019-08-07 15:58:30 -04:00
nemvar
0d5f3b1fc4 Leave me alone (#45743) 2019-08-07 14:55:30 -04:00
Michael Ashfield
8e3ace7e6f Plasmamen get plasma in their box (#45538)
* 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
2019-08-06 15:13:19 -04:00
kingofkosmos
c3ea51908d Adds "you" to local visible_messages (#45631)
* 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.
2019-08-06 02:15:34 -07:00
MMMiracles
cf5fa29c14 various fluff mapping items (#45699)
* ignore me thanks

* ass

* loads of misc fluff shit

* irrelevant shit

* chain file
2019-08-05 19:17:13 -07:00
nemvar
4d5fb1a578 Adds a GPS component. (#45660)
* 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
2019-08-05 19:13:19 -07:00
Rob Bailey
0c6fabceb0 Merge pull request #45680 from 81Denton/unfuck_c4
Refactors C4/X4
2019-08-05 19:09:57 -07:00
Tad Hardesty
009dbfc7cc Fix broken suits in medical outfit lockers (#45695)
* Fix broken suits in medical outfit lockers

* More dumb ass fixes
2019-08-05 18:57:35 -07:00
nemvar
ccbb0a91d7 Cleans up some martial art code. (#45502)
* Removes/Moves some weirdly placed variables in martial arts. Splits NO_GUNS and CHUNCKY_FINGERS traits.

* Maybe this should actually compile

* c begone
2019-08-05 16:58:12 -07:00
nemvar
0cb92c724a Fixes that one issue (#45717)
You can no longer pick up sofas
2019-08-05 11:50:22 -07:00
ishitbyabullet
71277af9d3 Improved Cabin Away Mission (#45618)
* 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.
2019-08-05 01:37:11 -07:00
Rob Bailey
2c720c6408 No ID insertion for everything except the hop console (fixes the ORM) (#45693)
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
2019-08-04 22:53:55 +12:00
nemvar
e587b970da Adds parent calls to almost all tool_acts (#45582)
* Adds parent calls to almost all tool_acts

* actually compiles
2019-08-03 22:25:57 -07:00
Tlaltecuhtli
5d2bd62beb fixes traps (#45650)
* Update maps.txt

* Update traps.dm

* Update maps.txt
2019-08-03 11:15:13 +02:00
kevinz000
c6d710d40e VV refactors 2 - Actually not indefinitely WIP (#45217)
About The Pull Request

The thing other than ruining maps that I was working on
Refactors VV to use a more standard way of doing topic dropdown options rather than a huge if/else chain
Marking datums is now a right click option
Moves a few files around too/few procs
Why It's Good For The Game

Makes it easier to add more VV dropdown options in the future, and moving href list keys to defines make misspelling them harder.
Changelog

cl
add: Oh yeah also added a "return value of proccall" option for VV var editing.
refactor: View Variables has been refactored. It should now be easier to make VV dropdown options.
/cl
2019-08-03 14:43:26 +12:00
Denton
ea787b243d h 2019-08-02 23:00:39 +02:00
Denton
154874d435 h 2019-08-02 22:44:59 +02:00
Denton
d98df6e063 Refactors plastic explosives
y
2019-08-02 22:31:05 +02:00
Fikou
556319be53 fixes fucky wucky 2019-08-01 10:54:24 +02:00
Twaticus
c2ce4562fc Inhand sprites for tiles #45611
About The Pull Request

Unique floor tiles now have their own unique inhand sprites. Moved floor tile inhands into their own file.
Why It's Good For The Game

Floor tiles okay.
Changelog

cl
imageadd: inhand floor tile sprites
/cl
2019-08-01 20:46:43 +12:00
RandolfTheMeh
2c3c2907de CE Blueprint Fixes (#45390)
About The Pull Request

Fixes #45341 so that blueprints can no longer be used when not in-hand, and turfs now properly compile a list of the blueprint items it should hold by delaying when it retrieves this information, as objects such as manifolds and wires didn't initialize with their proper sprite.
Changelog

cl
fix: The CE's blueprints can no longer be used if not in-hand, and its scanning function has been fixed.
/cl
2019-08-01 10:24:20 +12:00
Rob Bailey
e8030fecf6 Merge pull request #45581 from Twaticus/inhand-bedsheet
Inhand sprites for bedsheets
2019-07-31 03:00:49 -07:00
Rob Bailey
ea6c11d1b9 Merge pull request #45537 from bgobandit/spellingiseasyidk
Various spelling, grammar, and text changes.
2019-07-31 02:40:02 -07:00
Rob Bailey
6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
Rob Bailey
fcb98515e6 Merge pull request #45534 from nemvar/istype(src)
Removes some istype(src) stuff
2019-07-29 18:55:21 -07:00
Rob Bailey
e9b6356241 Merge pull request #45540 from blessedmulligan/telewelder
Welders only blind the user if they're close
2019-07-29 18:53:54 -07:00
tralezab
e94b6139cf Fixes some issues with balloons (#45554)
* Ok, this was just embarrassing

* uno

* dos

* tres

* cuatro

* wait, these vending machines are crazy similar...?
2019-07-29 18:51:41 -07:00
TWATICUS
1f0dc52435 Merge remote-tracking branch 'Upstream/master' into inhand-bedsheet 2019-07-29 06:11:36 -04:00
TWATICUS
7025d515b7 h
h
2019-07-29 06:11:07 -04:00
spookydonut
88eca69eb5 converts some spawns into timers (#45429)
* converts spawns into timers

* linter

* change per review
2019-07-29 02:23:15 -07:00
RandolfTheMeh
48fbc073e5 [TMC] Defib Rework, Organ Damage Effects (#45104)
* Brain damage works on organ damage procs, some defib reworks

* Heart and Lung damaging effects and failure, liver damage and failure moved to its organ again

* Cleans up reused global

* Organ damage procs on living and living/carbon

* Changes brain damage procs again

* SR heals all organs on revive, no decay for cybernetic implants, stomach damage and fail effects.

* Damage and failure effects for the appendix, ears, and some touchups on the stomach

* Committing changes so I don't lose them

* Organs now cease decaying in the proper containers

* Organ Fridges

* Reverts map changes

* Adds coronary bypass, lobectomy, trying to deal with organ_stat runtime

* Actually fixes merge conflict

* Smartfridge tweaks

* Think I figured out map merger

* Evidently not

* Still runtiming with glass shards even after I remove the map changes?

* Fixes runtime error with brain_item

* Runtime fix on living/carbon/life

* Cleaning up old PR code

* Brain damage fix, moves defines to actually be in _DEFINES, under DNA since that's where organ slots were

* Wrong math operation used

* Brains in MMIs no longer decay

* Removes redundant variable, and defibs no longer work on heart attacks caused by failing hearts

* Removes misleading comment

* init freezes organs in case organ crates are added, morgue corpses are frozen, removes adjustLiverLoss

* Removes random spaces, scanners check brain damage severity now

* Swaps numbers for defines, fixes brain surgery, rebalances coronary bypass bleed since that was insane last I tested it

* List change

* Runs off of an index instead of using cut

* Brains can be put into organ fridges

* Fixes minor type, hotfix for cloning problem

* Removes pointless check

* Demon hearts no longer decay

* Nightmare hearts no longer decay

* Removes istype() check on process, sets can_decompose instead

* Condenses organ damage report

* Removes organ failure messages

* Less organ damage spam, implements organ threshold messages instead

* Brain damage messages go to owner, not source

* Self-examine shows damaged organs

* Minor code cleanup, adds autodoc comments to the new procs

* Inverts standard organ vars to prevent random organs decaying, adds a few more autodoc comments.

* Merged the booleans into a set of flags

* Healthy living improves organ healing rates

* dunno why this didn't update

* my actions have consequences

* Sets ORGAN_SYNTHETIC for overlooked robotics organs

* Doubles heart decay time

* 3 minute heart decay

* Lobectomy/Coronary_Bypass heal more

* removes hivemind spells from the changes
2019-07-29 02:18:22 -07:00
Dennok
48258b68c9 Spending of tank don't change distribute_pressure. (#45434)
Tank still give max of available pressure.
2019-07-28 18:01:57 -07:00
Garen Crownguard
58b5819be0 Fixes infinite loop when you catch a cult bola (#45492) 2019-07-28 17:58:35 -07:00
nemvar
877cfc7b21 Fixes crab 17 qdel problem. (#45523)
* QDEL_IN

* No longer keeps racking up timers.

* Moves it to init, because why not?
2019-07-28 17:22:51 -07:00
nemvar
dabbd79ca9 Filthy override 2019-07-28 18:46:05 +02:00
Dennok
213b86ca22 Shuttle-buttons (#45444)
connect_to_shuttle add shuttle id to connected machine id
Buttons from one shuttle dont controls machinery from another by default
2019-07-27 20:19:56 -07:00
blessedmulligan
36da801edd welders no longer flash the user if the user somehow manages to not be adjacent to the welder 2019-07-27 21:43:09 -05:00
bgobandit
a53d7d38d4 what has become of my life 2019-07-27 21:54:12 -04:00
nemvar
f7c9751d69 Removes some istype(src) stuff 2019-07-27 22:55:49 +02:00
py01
d96ff5beff Flashbangs auto-stun in radius 1 (#45381)
* flashbangs stun in radius 1

* changes flashbang rad 1 effect
2019-07-27 04:41:04 -07:00
nemvar
26eea3c056 Extremely critical documentation. (#45504) 2019-07-27 02:39:02 -07:00
Tad Hardesty
9db90154a0 Fix some circuit board examines (#45488) 2019-07-27 02:35:43 -07:00