Commit Graph

23948 Commits

Author SHA1 Message Date
MMMiracles
5bf2bafdd8 Adds Capitalism Firing Pins (#45893)
* 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
2019-08-19 22:56:06 -07:00
itsadavid
3c3361d59e tweaks armor values on crab-17 (#45798)
* tweaks integrity and armor values on crab-17

* feedback
2019-08-19 20:15:33 -04:00
tralezab
5e23217e82 Fixes camera mobs being launchpadded, allows ghosts to click to use the launchpad (Revived edition) (#45969)
* song for this fix: New Order - Blue Monday

* whoops
2019-08-18 21:42:38 -07:00
skoglol
ac8a79f521 Change default atmos to low pressure for some non-lavaland stuff (#45981)
When lavaland got randomized atmos, these weren't changed to reflect 
that. None of these turfs are used on lavaland, but still generate 
whatever random atmos lavaland does.
2019-08-18 11:39:58 -07:00
nemvar
b36d1364c8 Tries to salvage the mech wreckage (#45904)
* Tries to salvage the mech wreckage

* messed up dark gygax

* Update mecha_wreckage.dm
2019-08-18 00:31:19 -07:00
nemvar
8443ce45ff Makes mechtopic look nice. (#45902)
* Makes mechtopic look nice.

* fixes rogue linebreaks

* Update mecha_topic.dm
2019-08-17 23:48:51 -07:00
carlarctg
15717dda7a Gives borg tools unused sprites (#45939)
* where's the get good button

>adds some borgtools
>fills empty tool pixels with 254 transparency pixels

* tool stuff

* fixes icon

* repoked

* cobbdescus part 123/X: cobbtool cobbmove cobbreview
2019-08-17 23:48:26 -07:00
Redmoogle
3be5ca8676 Charlie Station Redesign/Rework (#45838)
* Charlie Rework

* Charlie Rework Extra Fluff

* .slap MapDiffBot

* Stop being stupid MapDiff Bot

* you too travis

* Adds a extra set of o2 tanks, adds some more rust, and fixes 2 solar panels already being prebuilt

* Adds a few more meteors and general fixes

* Mining Area for Charlie/Beta Added

* Charlie Station Mining Area

* General fixes

* Beta Hallway is longer also puts stuff into more proper places

* Fixes a 1 tile fuckup

* Fixes bad wall placement and also hallway doors

* Removes out-of-place plants oops

* Adds extra areas for charlie

* Changes the threat

* Removes gas miner and general fixes
2019-08-17 23:47:18 -07:00
tralezab
8b190dbc27 fixes golems not getting antag and other things when switching shells (#45941)
fixes golems not getting antag and other things when switching shells
2019-08-17 23:41:33 -07:00
nemvar
a40ee7d303 Changes hulk code. (#45866) 2019-08-17 00:55:27 -07:00
Rob Bailey
419bffc8b8 Merge pull request #45937 from tralezab/patch-63
adds a headgear check to crayons
2019-08-17 00:36:51 -07:00
Rob Bailey
a4ee16130d Merge pull request #45940 from nemvar/removesmechevents
Removes mech events
2019-08-17 00:35:55 -07:00
tralezab
4fa0d761a8 song for this fix: Enigma - Modern Crusaders (#45936) 2019-08-16 21:12:21 +02:00
Tlaltecuhtli
451258371e differentiates mech punches between durand and gygax + removes auto punch from leg acurator (#45879)
* Update maps.txt

* 1

* no bump smash

* moves var
2019-08-16 10:56:38 -04:00
nemvar
8918a88612 Makes organ decay a lot nicer. (#45845)
* 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.
2019-08-15 21:52:07 -07:00
nemvar
e1fce5a29a Removes mech events 2019-08-15 22:57:39 +02:00
tralezab
e9988dffba whoops 2019-08-15 12:33:29 -07:00
tralezab
81529e49fe song for this fix: Seiko Matsuda - Aoi Sangoshou 2019-08-15 12:30:13 -07:00
Dennok
cc26d3316c Fix multi surgery. Add operating computer surgery target. (#45900)
* fix multi surgery

* drapes fix

* Operating computer target show
2019-08-14 16:25:17 -04:00
Akrilla
809be06373 [TMC] Baton rework (#45377)
* stun

* stamina tweak

* 5 units

* 2 hits even with chem

* Update stunbaton.dm

* This is a good slowdown

* new chem + confusion

* overdose

* h

* update

Co-Authored-By: JJRcop <jrubcop@gmail.com>

* less cheap

* better overdosing

* typo

* *=

* confused

* overdose tweaks

* tweak

* no var

* typo

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* *

* tweaks

* stamina batons

* knockdown

* Update code/game/objects/items/melee/misc.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* number tweaks

* maint

* 2

* cooldown and less stuntime

* tweaks

* conflict

* text
2019-08-14 14:59:46 -04:00
81Denton
1c4036b309 [TMC] Explosion rebalancing (#45819)
* 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
2019-08-14 10:55:50 -04:00
Rob Bailey
b25d3efda2 correct black suit (#45876)
* correct black suit

* two piece in wardrobe
2019-08-13 17:17:55 -07:00
Dennok
4e6d8c073a Silo link RCD upgrade (#45607)
* Update all_nodes.dm

* Update RCD.dm

* Update RCD.dm

* Update construction.dm

* Update tool_designs.dm

* Update RCD.dm

* Update RCD.dm

* Update RCD.dm

* fix mat container

* up

* add radial silo link button

remove silo link verb
2019-08-13 16:59:03 -04:00
Sanator
4bd547b047 Changes the DNA console icons to be less awful (#45869)
* Changes the DNA console icons to be less awful

Made some better placeholders

* fixed a blinking pixel
2019-08-13 16:53:57 -04:00
bgobandit
ee0d68aeca Clicking a display case on help intent examines it. (#45842) 2019-08-13 16:48:03 -04:00
Rob Bailey
4b17e5297f Reinforced window construction fixes (#45890)
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
2019-08-13 17:19:26 +12:00
81Denton
24b21c19e2 Laserpointer scaling fix (#45860)
h
2019-08-12 20:29:42 -07:00
nemvar
264befb4e8 Doors no longer update_icon in Destroy (#45830) 2019-08-12 20:10:09 -07:00
skoglol
69227e45f6 Selected Access in HoP Console is Now Green (From Red) For Viewability (#45848)
* Removes red/blue ID console button combo.

* Different color.
2019-08-12 16:26:46 -04:00
Jeremiah Cooley
2f555244bb Close quarantine module loophole (#45766)
* Quarantine module now has teeth

* Quarantine applies to everyone

* typofix and more genericness

* Legal clarification

* Rules lawyering

* Rule 1 friendlier version
2019-08-12 10:47:16 -04:00
tralezab
b5de31638d You can no longer name some things after words in the ic filter (#45696)
* quick sanity fix

* more things i found

* better list used, updated comment
2019-08-11 18:33:39 -04:00
bgobandit
6ef0fe8889 Wizard rounds actually check to see if the wiz died and the round is over (#45793) 2019-08-11 02:26:30 -07:00
nemvar
9df5123b53 Gulags makes money no more. (#45817) 2019-08-10 18:16:15 +02:00
James
be3000d8ca All windows now have consistant spans (#45809)
* R-Windows now have consistant examine messages

* I forgot plasma windows too
2019-08-10 02:25:07 -07:00
Akrilla
9ca37e9169 Contract rerolls and general enhancements (#45703)
* 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"
2019-08-10 02:11:11 -07:00
Mickyan
1c520ee04f range (#45774) 2019-08-09 15:06:50 -07:00
nemvar
7f75d2c351 Fixes defib paddles (#45797)
* Fixes defib paddles

* Wow weee

* Adds some qdel stuff
2019-08-09 12:13:02 -04:00
nemvar
02251be5ac Turns Gibberish code into something that's not gibberish (#45753) 2019-08-09 11:32:32 +12:00
YPOQ
f4a76f9f48 Fixes being unable to clone multiple empty clones simultaneously (#45768)
cl
fix: Fixed being unable to clone multiple empty clones simultaneously
/cl

My bad, should have caught this in my last PR.

Fixes #45721
2019-08-09 11:29:10 +12:00
penterwast
c58f7e4806 Log nuke request messages (#45778)
About The Pull Request

Adds logging for CentComm nuke code requests.
Why It's Good For The Game

The actual text of nuke code request messages is not currently logged anywhere. This PR removes ambiguity/guesswork when investigating them.
Changelog

cl Penterwast
admin: Added logging for CentComm nuke request messages.
/cl
2019-08-09 11:27:25 +12:00
TheChosenEvilOne
a7cde8ce39 [Ready] Ports dynamic gamemode from /vg/ (#44639)
About The Pull Request

Port the dynamic gamemode from /vg/.
(Really bad explanation of the mode incoming.)
The dynamic game mode generates a threat number which is used to "buy" rulesets (rulesets are basically your antagonists). This means you can have rounds with for example traitors and cult (you can have up to three roundstart rulesets depending on the pop and threat level), and then there are latejoin and midround rulesets which basically do what they say (latejoin ruleset assigns late joining player as an antagonists and midround assigns ghosts or a currently alive player as an antagonist)
Why It's Good For The Game

This increases the chances of people getting their important antagonist role and makes rounds more interesting (when cultists gets their hand on wizard's magic) when everything can happen at the same time (cult, wiz and traitor could happen on high threat level).
Changelog

cl
add: Ported dynamic mode from /vg/, originally made by DeityLink, Kurfursten and ShiftyRail
/cl
2019-08-09 11:26:03 +12:00
oranges
8c8e618804 Merge pull request #45694 from AutomaticFrenzy/patch/fix-stupid
Remove atom creation in vending machine icon generation
2019-08-09 11:11:24 +12:00
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