Commit Graph

216 Commits

Author SHA1 Message Date
ShizCalev
f10c962b1d Fixes floorbot construction with normal toolboxes. (#43112) 2019-03-20 11:12:00 -04:00
Pandolphina
60c22f1651 Fixes #43191 (#43195) 2019-03-20 10:55:13 -04:00
Rob Bailey
ee33e9c6a8 [READY] The war on stun based combat, Phase I: Fuck ranged stuns (#42930)
Nukes the hybrid taser from orbit. Everywhere that spawned it now provides a disabler instead. Standard sec issue? Disabler. Armory? Disabler rack.
Want something with more punch? Beg the warden for a shotgun or an energy gun.
The hybrid taser itself has not been removed from the codebase.
Also removes the stun from the advanced energy gun so it doesn't just become the late game secret powerhouse.
Hoslaser keeps it, but only gets three shots instead of five.
The ebow has been COMPLETELY RUINED as well. See the changelog for details I'm too lazy to copypaste.
Why It's Good For The Game

Fuck stun based combat.
Sec still have their stunbatons, collapsible batons still exist, pepperspray still exists, flashbangs still exist. but now any fight involving sec or anyone who has robusted a sec officer will be less ranged instastun bullshittery.
Changelog

cl
balance: New NT regulations have replaced the standard issue hybrid taser with a pure disabler.
balance: Also fuck the stun mode on the advanced energy gun who thought that was a good idea.
balance: The hos's laser can only fire three taser shots instead of five.
balance: Energy crossbows have been reworked. They no longer paralyze, but instead heavily blur vision, apply a huge burst of stamina damage, and knock you on your ass for one second. Two shots is enough to down someone from stamina crit on both the mini and large versions. The blur lasts for 10 seconds.
balance: The price of the mini ebow has been reduced to 10TC to compensate for this weaker effect.
tweak: The ED-209 is now built with a DRAGnet and fires netshot instead of taser bolts.
balance: Stunshells can no longer be produced in any lathe.
balance: The "pacifier" mech taser can no longer be built.
/cl
2019-03-08 10:30:50 +13:00
tralezab
0a51e7e1b9 [PROBABLY READY? REVIEW WITH SCRUTINY] New event: Fugitives (#42554)
* fugitives

* lets make this a bit cleaner

* cultists and the beginnings of security detail, lots of wip

* wip security

* WALDO (and some more work on yalp, of course)

* adding antagonist teams for both hunter and fugitives, roundend report beginnings

* this whole file is shit, but hopefully a little better

* it compiles (+ space police)

* some more work

* S.E.L.F. fluff

* grammar and icon fixes

* lets finish yalp elor, give it the justice it deserves

* moves hunter spawns to ship pods + russians P1

* moves hunter spawns to ship pods + russians P2

* fugitives and hunters now recognize eachother

* hunter spawning finished(?)

* missed this

* ATH's review

* runtime fixed, added yalp's transport ability

* anturk's review

* makes hunter.dm better trust me

* oopsies

* INVOKE_ASYNC

* russian ship + finally a (bad) sprite for the capture machine

* step > pixel, thanks travis

* mooshroom review p1

* mooshroom review p2

* improper use of /improper

* waldo's radio doesn't stick, police id

* candidate picking is more flexible + minor things
2019-03-06 10:17:46 -05:00
Jordan Brown
e83b6256fa Merge pull request #42972 from TerraGS/bot-cleanup
Cleans up bot construction code
2019-03-03 23:05:17 -05:00
Jordie
e1d5052fa6 Merge pull request #42896 from py01/bundle
New Tactical Syndicate Bundle: Recon
2019-03-02 23:08:09 +11:00
Time-Green
ad1dd38655 Adds snailpeople as a rare genetic meltdown effect (#42889)
Meant to be part of #42864 , but got a little big so I'll add it to wichever gets merged last.
[Snailcrawl demonstration](https://youtu.be/IL7WFpfRo4c)

PROS

- Gets snailcrawl, wich makes them greatly faster and gives them a lube trail

- Their blood is spacelube

- They get a cool armored nodrop snail shell

- They don't slip

CONS

- Very slow

- Punch is pathetic

- Tttaaalllkkk llliiikkkeee ttthhhiiisss

- Extremely vulnerable to salt

- Can't wear glasses

Adds gastrolisis, wich is pretty much [this](https://www.youtube.com/watch?v=lFbPi8o0OEU) spongebob episode where they slowly turn into snails

You can also get gastrolisis by random_reagent_id, so maintpills and botany

🆑
add: Adds snailpeople as a rare genetics accident.
sprite: Snailshell sprites by nickvr628
/🆑
Snailshell sprites by @nickvr628

Why: It's a silly gimmicky race and it's a rare occurence. Also extremely highly requested for some reason
2019-03-02 09:40:56 +13:00
TerraGS
8e68526133 cleans up bot construction code 2019-03-01 14:39:03 -06:00
py01
854a6ca11c bundle added 2019-02-24 16:08:27 -06:00
Tlaltecuhtli
d3d76eb3c7 light replacer tweaks (#42720) 2019-02-12 19:59:10 -05:00
Vile Beggar
d13420801b Properly adds a Janitor ERT (#42659)
* does the thing

* adds the regen thing to the sprayer

* adds a quite important addition to a comment

* capitalizes janitorial response

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* adds cobby's process suggestion
2019-02-06 15:56:31 -05:00
wesoda25
1cadfc9580 Branches Syndicate Bundle into A and B Categories, adds Mr Freeze Bundle (#42662)
* Update uplink_items.dm

* update item names

* does all that stuff

* whoop forgot a comma

* adds geladi and cryo to mutation injector list

* adds mr freeze, i think

* maybe this will work?

* defines geladikinesis and cryo

* possibly fixes what was wrong

* ohhhhhhhhhhhhhhhhhh im an idiot

* one last thing

* mr freeze gets temp gun

* 20 TC

* Update uplink_kits.dm

* maybe?

* name change

* Update uplink_items.dm

* temp gun didn't have a firing pin
2019-02-05 21:49:21 +11:00
Rob Bailey
69e217d8d9 [READY] I got guns (#41804)
cl actioninja\memager
refactor: Ballistic guns have been almost entirely reworked from a backend side. This primarily focused on moving as much as possible into the base ballistic gun and turning as many other guns into essentially varedits as possible.
add: Guns can now be racked. This is the default action unless the magazine is empty.
add: Guns now can have the magazine removed by clicking on them with an open hand while they are in hand.
tweak: Suppressors are now removed by alt clicking instead of clicking with an open hand
add: Guns now have various bolt types that all function a bit differently. Open bolts cannot have a bullet chambered with no mag, locking bolts lock back after running out of ammo, etc.
add: All ballistic gun sounds are controlled by variables instead of hardcoded usages.
tweak: The l6 LMG has a reworked control scheme. alt + click to open and close the cover, open hand to remove mag, place mag in by slapping them together, default action is rack.
tweak: Functionality that used to be snowflake code such as tactical reloads has been moved to the base gun, and can be toggled by variables.
refactor: All shotguns are now properly subpaths of the shotgun type. They still work the same.
imagedel: Gun sprites have been almost entirely overhauled to use overlays instead of states. This collapsed the L6 sprite from 20 sprites to 9 sprites to give an example.
soundadd: Remixed versions of the shotgun and base gun firesound
soundadd: New rifle firesound for l6 and moist nugget, new SMG fire sound, new sniper fire sound.
soundadd: Lots of new weapon operation sounds such as racking and bolts and the like.
imageadd: New sprites for the Riot Shotgun, Combat Shotgun, c20r, Deagle, m90, double barrel shotgun and 1911 by Memager.
imageadd: All gun sprites that were pointing to the left have been flipped to point to the right.
balance: Shotguns now can be pumped faster.
balance: Bulldog can now be tac reloaded
balance: Sawn off shotguns now have an accuracy penalty and recoil
/cl
2019-02-04 10:27:01 +13:00
wesoda25
05ec39dfba Adds Bee and Mad Scientist Traitor Bundles (#42612)
* BEE BEE BE EBBEBE!!!

* fixes bioterror path + sabotage bundle
2019-02-03 19:30:15 +11:00
Trilbyspaceclone
555f0bda23 Fixes power tool drill fitting in boots/wallet (#42476)
* Update wallets.dm

* Update pockets.dm

* Apply suggestions from code review

For when people forget how sister code works

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-01-23 14:32:04 -05:00
Tad Hardesty
5c6f0edce6 Fix mousetrap boxes having no illustration 2019-01-19 23:02:54 -08:00
oranges
18200016d9 Bibles no longer runtime when changing bible style (#42411)
The correct icon states are restored, meaning yoru bitching necronomicon
can look cool now
2019-01-19 06:47:37 -07:00
Dax Dupont
4f9d04bc32 This is a family friendly codebase (#42385) 2019-01-17 11:35:23 -05:00
granpawalton
4c8d35cbbe allows proffesion belts to hold their appropriate holosign (#42376) 2019-01-16 17:08:07 -05:00
duckay
9cf3c5bbf8 Assistant Traitor Item: Part Electric Boogatwo (#42297)
* toolbox pls

* rstar

* Update uplink_items.dm

* contents, force

* i

* toolbox now costs 2 tc

robuster

* "toolbox"

* grammar mistake

* bust < bash

* description is better

A old, blue toolbox, it looks robust.

* changed bash skulls to bust heads

because i just watched the space station 13 video again

* yuh

* asdf

* throw!

* uplink now notes that it increases in damage
2019-01-15 12:13:36 -05:00
Jordan Brown
bf880ffde2 Merge pull request #42298 from coiax/spot-the-satchel
Fixes smuggler's satchels not being visible with t-ray
2019-01-15 09:27:08 -05:00
coiax
d8f84ca966 Desc/iconifies various pills, admin floorpill bottles (#42229)
* Renames aranesp, desc/iconifies various pills, admin floorpill bottles

* Unrenames
2019-01-14 17:32:40 -05:00
Jack Edge
4a2433317c Fixes smuggler's satchels not being visible with t-ray
🆑 coiax
fix: Smuggler's satchels can now be found with t-ray scanners, as
intended.
/🆑

Fixes #42296.

I used a trait because currently this is the only object that I'm aware
of that uses partial invisibility (because it wants to be visible to
ghosts), and it seems a waste to dedicate an entire obj_flag to one
item, or put a hardcoded typepath.
2019-01-09 19:31:53 +00:00
coiax
ffd160a495 Readds non-persistent contraband filled smugglers satchels (#42228)
* Readds non-persistent contraband filled smugglers satchels

* Ten random satchels are placed each round
2019-01-07 21:16:47 +11:00
81Denton
cd3d97c1a6 Reworks spearguns, adds Syndicate bundle, carp clothing adds carp faction (#42102)
* Reworks magspears, adds Syndicate bundle, carp clothing adds carp faction

* 20 magspears

* Replaces bandolier with quiver

* Slightly increases throwforce to OHKO space carps
2019-01-07 19:19:45 +13:00
Tad Hardesty
3b2c0e27f7 Scope various unscoped locate() calls (#42195)
* Scope locate calls which are immediately checked against a list

* Remove silly use of locate from bible Topic

* Scope various locate calls (needs testing)

* More WIP

* Buff up lightswitches while we're here

* Tidy record browsing code

* Scope a few more locates

These have caused problems in the past (#41917, #39303). Continues #29349.

Also cleans up lightswitch code while I was already touching it.

I recommend a testmerge.
2019-01-06 20:39:27 +13:00
Jack Edge
c70aeb8dc9 Fixes Spontaneous Brain Trauma runtimes
🆑 coiax
fix: The Spontaneous Brain Trauma event now has a range of possible severities,
and no longer runtimes.
/🆑

In addition, I changed the description/names of some pills to make them more
accurate, and added some neurine pills, because I needed them for testing.

With thanks to @oranges for spotting the runtime in the first place.
2019-01-02 23:25:33 +00:00
duckay
e69901d6dc chance to get the standard red spacesuit from syndicate space suit boxes (#42147)
* Update uplink_kits.dm

* Update uplink_kits.dm

* Update uplink_kits.dm

* gringo

* dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
2019-01-02 15:54:00 -05:00
subject217
5a52f8a7bf Removes smugglers satchels (#42166)
* Removes smugglers satchels

I love the cutie reading this

* remove smuggler's satchel from code

* removes all smugglers' satchel persistence code

* removes remaining things

storage component for smugglers, the miracle ruin (uses smugglers), the dme
2019-01-02 15:28:26 -05:00
Denton
1fec2a3d1b Runtimestation tweaks 2018-12-29 00:32:14 +01:00
coiax
d27c64c3a8 Christmas code changes (#41763)
* Christmas code changes

🆑 coiax
add: Santa can now examine presents to see what's inside.
del: Santa no longer has a mass summon presents spell, because of his
new regenerating bag!
add: Santa's bag regenerates presents as long as Santa is holding it.
balance: You can only find one gift under a christmas tree per round, no
matter how many trees you search.
balance: Santa's teleport does not announce where he's going.
fix: Fixed Santa not having a full head and beard of white hair.
fix: Fixed Santa not being genetically white-haired.
fix: Fixed Concentrated Barber's Aid not growing extreme amounts of
hair.
/🆑

The `box` var has been moved down from `/datum/outfit/job` to
`/datum/outfit`.

Added unlimited christmas tree with presents, for testing.

Santa's restriction against opening presents is now done by
TRAIT_CANNOT_OPEN_PRESENTS. Santa's ability to see inside presents is
done by the TRAIT_PRESENT_VISION, which also determines if Santa's Bag
will regenerate presents every 30 to 60 seconds.

Santa no longer starts with a breath mask and O2 tank, but instead has
an internals box. Santa no longer has a no-access gold ID, he can
teleport from room to room!

Gifts determine what type is inside them on initialization, rather than
when unwrapped.

- Reasoning -

Unlike last year, there are various possible methods of accessing
christmas trees spawners, allowing for an unlimited number of anything
presents. Cutting down the presents to one per round regardless of tree
count will avoid this.

Santa should be able to see what he's giving, because then he can reward
the naughty and nice children with different gifts.

* Missed a merge

* Adds present investigate logs, and visible messages

* Use the body+mind checking of mob.has_trait

* Less globals, more static vars on types; also event renaming
2018-12-16 12:44:53 +13:00
skoglol
c40698d27a Added some items to bio and chem bag. (#41823) 2018-12-06 20:04:16 -05:00
moo
d057de9b6e Merge pull request #41468 from Steelpoint/AdvMedkit
Advanced First Aid Kit
2018-12-05 11:01:48 -05:00
ShizCalev
9997f956b0 Fixes ODing on crank/other chems, viruses, and other things damaging/healing robotic limbs. (#41593)
cl ShizCalev
fix: Fixed chem OD's causing damage to robotic limbs.
fix: Fixed wood golems repairing robotic limbs every tick of life()
fix: Fixed vampires repairing robotic limbs every tick of life()...
fix: Fixed shadowpeople healing robotic limbs every tick of life()
fix: Fixed poppeople healing robotic limbs every tick of life()
fix: Fixed adjustBruteLoss and adjustFireLoss not properly discriminating for limb status types.
tweak: Fixed bibles healing robotic limbs, because your false deity can't fix SCIENCE.
fix: Fixed the Starlight Condensation, Nocturnal Regeneration, Tissue Hydration, Regenerative Coma, and Radioactive Resonance virus symptoms repairing robotic limbs.
/cl

Gonna be away the next two weeks, so if there's anything major after today just go ahead and close it and I'll fix it when I get back.
2018-12-02 20:12:22 +13:00
skoglol
8983a37320 Some syndie implant cleanup (#41571)
cl Skoglol
code: Added missing typepaths for syndicate implanters.
tweak: Stealth implant now comes in a box.
spellcheck: Changed the names of some syndicate boxes.
/cl

Some implanters were specific typepaths, others were basic implanters that had implants put in when the box was created. This makes them all behave the same. I considered removing the boxes for the implants as they aren't strictly needed to hold one thing, but I know some people like using boxes in their atmosphere and inventory management sim so I left them in.
Otherwise, specifying that a box contains something that is boxed was silly so I changed that. Except for the space suit, because that feels right.

And of course the stealth implant gotta come in a box.
2018-12-02 20:10:05 +13:00
81Denton
3ee98bfc72 Rebalances emergency oxygen tank availability (#41683)
* Rebalances emergency oxygen tank availability

* Reverts pirate outfit change
2018-11-28 22:45:15 -05:00
Jordan Brown
2e227d11ee Merge pull request #41602 from swindly/word_crimes
Fixes more word crimes
2018-11-21 09:44:00 -05:00
swindly
4bcd3cdc55 fixes word crimes 2018-11-19 17:56:59 -05:00
81Denton
0bfe0cc80f Improves Uplink descriptions + formatting (#41565)
* Improves Uplink descriptions + formatting

* ree

* linebreaks

* misc fixes
2018-11-18 10:26:09 -05:00
Emmett Gaines
a6971e2673 You can put spaghetti in your pocket (#41517)
* You can put spaghetti in your pocket

* Improved drop text
2018-11-16 13:25:59 +01:00
Steelpoint
f3bd3d7a8d Nuke Op Tactical Medkit Reshuffle (#41444) 2018-11-16 06:33:45 -05:00
Steelpoint
a960c50544 Update firstaid.dm 2018-11-15 15:23:57 +08:00
Steelpoint
8c3324ea2c PenAcid+AdvAnlyRemoved 2018-11-15 00:01:19 +08:00
Mickyan
f1536c1fcc webbing price (#41450) 2018-11-13 18:16:24 -05:00
Steelpoint
20927f7f02 InitialCommit 2018-11-13 12:49:55 +08:00
ShizCalev
dc019b09ba Fixes illiterate & blind mobs being able to read books (#41400)
cl ShizCalev
fix: Fixed inconsistency where illiterate and blind mobs were able to read some books/manuals, but not others.
fix: Fixed mobs being granted mime speak even if they failed to finish reading the Guide to Advanced Mimery Volumes 1/2.
/cl

Step towards resolving #41396
2018-11-12 21:10:21 +13:00
ShizCalev
157de4243a Allows paper airplanes to be vareditted to always hit someone in the eye (#41328)
cl ShizCalev
tweak: Paper airplanes can now have their hit probability adjusted by badmins.
add: Added syndicate paper airplanes. They are rather robust and are guaranteed to hit someone in the eye.
add: Added The Art of Origami to the syndicate uplink. This allows you to fold weapons grade paper airplanes. It will also allow you to catch paper airplanes when you have the ability enabled.
/cl
2018-11-12 20:49:32 +13:00
Steelpoint
b9391bf203 Security Webbing (#41394)
This PR sees the addition of an expensive item to the Security vendor, the security webbing. A unique chest rig.

The concept of this item is to give Officers something to spend their money on when they save up.

webbing

The chest rig is intended as an expensive minor upgrade over the standard security belt that security personal can purchase. Functionally it is identical to the security belt except it can hold one extra item, up to 6 from 5.

The belt costs $800, meaning round start Officers will be unable to afford it. The sec vendor holds five of these webbings.

cl Steelpoint
add: Nanotrasen Security has unveiled a newly designed Security Webbing, a minor upgrade over the standard issue security belt that is comfortable, tactical and able to hold an extra security item.
add: However, the webbing is not considered standard issue, so any interested officers will need to buy the item from a SecVendor out of their own pay.
/cl
2018-11-12 20:36:01 +13:00
Mickyan
c0ac8d514f Adds new moodlets, psychotropic drugs (#41207)
cl Mickyan
add: Added various new moodlets
add: Most notably, the Laughter chemical and breathing small quantities of N2O can improve mood
add: Psicodine: a new chemical that can restore sanity levels to normal and temporarily suppress phobias
add: Happiness: a homemade drug that supposedly gives a feeling of total bliss and.. emptiness? That can't be healthy... watch out for side effects.
fix: The suffocation moodlet now triggers correctly
fix: The drunk moodlet now clears as soon as the drunkenness wears off
/cl

Fixes #41170

List of new moodlets:
Jittery
Vomiting, vomiting all over yourself (gross)
Painful medicine application (silver sulfazine/styptic powder/syntflesh) - very short duration
Chemical euphoria (breathing N2O)
Laughter/Superlaughter reactions
Happiness drug related reactions

Psicodine: keeps your sanity at least above neutral level and suppresses phobias as long as it's in your system. Also available from pill bottles at the medivend at a premium.

Happiness: loosely inspired by Joy from LISA, very addictive, does minor brain damage, withdrawal makes you slowly go insane and overdose makes your mood jump all over the place. Also suppresses phobias. Good if you need a very quick and powerful boost but not very practical for keeping your mood up for long periods.
2018-11-04 15:01:05 +13:00
SouDescolado
88bf454538 Make code beautiful v2.0 (#41021)
cl
refactor: For every object that creates 3+, replaced with a for(var/i in x to y) and sometimes combined into a list
/cl

[why]: I did something like this in the past. It removes multiple lines in favor of a simple For and sometimes have some lists
2018-10-27 13:17:50 +13:00