Commit Graph

2262 Commits

Author SHA1 Message Date
Dawson1917
5ffefaeacd Fixes spelling errors in the Berserker hardsuit (#45933) 2019-08-16 21:08:48 +02:00
Rob Bailey
b25d3efda2 correct black suit (#45876)
* correct black suit

* two piece in wardrobe
2019-08-13 17:17:55 -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
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
pireamaineach
6048d747c2 [READY] Makes plasmaman helmets have visors. (#45606)
About The Pull Request

See title.
Why It's Good For The Game

Plasmamen get the same welding protection as everyone else, that is with welding helmets, with the same trade-off and negatives. Goggles are rather hard to obtain for most roles, (provided #45460 is reverted, which is kind of ought to be) and plasmamen aren't able to use helmets.

Basically nullifies the concept of using this as flash protection unless used by a particularly quick-witted plasmaman, (or someone willing to always be half-blind) while still offering welding protection.

I might consider re-adding transparent helmets but only if humans wear them, as it doesn't look good on plasmamen, which is the whole point of the helmet.
Changelog

cl
balance: Plasmaman helmets now have welding visors, which can't stack with their torches in the helmet and are visible.
fix: Clicking on the helmet with any item no longer tells you that someone's already drawn a face on it, you can't put infinite faces on it.
tweak: Plasmaman helmets hide masks again, the sprites are no longer transparent. Mind, the original bounty just wanted it so you could see faces through it, not for it to be transparent.
tweak:Plasmaman helmets now have special smile sprites rather than pulling from the EVA one, as the visors are different sizes.
balance: You can't eat through plasmaman helmets anymore.
/cl
2019-08-09 11:02:37 +12:00
Rob Bailey
0c6fabceb0 Merge pull request #45680 from 81Denton/unfuck_c4
Refactors C4/X4
2019-08-05 19:09:57 -07:00
carlarctg
5b9eb3bff2 trenchcoat (#45722) 2019-08-05 11:49:27 -07:00
MMMiracles
a76d7c3077 Bounty PR: See-through plasmaman visors + drawing smiley faces on said visors (#45602)
* see-through visors and funny smiley face meme

* fucking dme

* how did i manage that
2019-08-05 01:33:17 -07: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
Dawson1917
e9b9785392 Removes slowdown from riot suits (#45656)
About The Pull Request

Removes the slowdown from riot suits in an effort to make them more useful to security.
Why It's Good For The Game

Riot suits have for a while firmly sat in the "garbage-tier" for experienced players because slowdown more or less completely obstructs security from doing their jobs as any perp can outrun them. Given Oranges recently expressed a desire for coded changes that make sec less ridiculously vulnerable to tiders and easy to loot, particularly with hallway shoves, I believe making riot armor an actually useful tool to deal with tiders via its innate shove/knockdown immunity could help.
Changelog

cl
balance: Riot suits no longer have slowdown
/cl
2019-08-04 09:31:53 +12:00
Tad Hardesty
f1f9d604dc Remove atom creation in vending machine icon generation 2019-08-03 13:30:38 -07:00
nemvar
e7fbf37fca Turns gloves of the north star functionality into a component. (#45557)
About The Pull Request

title.
Why It's Good For The Game

The goal of this is to get rid of the Touch hook for gloves. Currently the only other thing that uses this proc is ninja gloves which I will try to remove at a later date.
Changelog

cl
code: Gloves of the North Star functionality is now handled by a component.
/cl
2019-08-03 14:51:25 +12:00
nemvar
ea70deb828 List of contents (#45476)
About The Pull Request

-You know require medical access to change the medical records with the hud
-Medical/Sec HUD examine now relies on a trait instead of istype checks.
-Removed a shitload of excessive nesting
Why It's Good For The Game

This isn't a full refactor, just a small attempt to make this code slightly more sane and more friendly to work with. I do not intend to fix all the problems this piece of code has (ohh, there are so many of them) with this PR.
Changelog

cl
balance: You now require medical access to change the medical records with a medHUD.
/cl
2019-08-03 14:49:36 +12:00
Denton
d98df6e063 Refactors plastic explosives
y
2019-08-02 22:31:05 +02:00
oranges
8b53bf93e1 Merge pull request #45616 from 81Denton/goggles-techwebs
Moves welding goggles to protolathes
2019-08-01 10:23:16 +12: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
Denton
cef6714202 Moves welding goggles to protolathes 2019-07-30 17:53:45 +02: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
spookydonut
88eca69eb5 converts some spawns into timers (#45429)
* converts spawns into timers

* linter

* change per review
2019-07-29 02:23:15 -07:00
bgobandit
c2dff281f4 join the army they said 2019-07-28 21:01:26 -04:00
Garen Crownguard
e851b6550a Cult hoods can be toggled (#45497)
* Cult hoods can be toggled

* oops
2019-07-28 05:00:50 -07:00
Garen Crownguard
bab2b442cb Fixes long hair going through hoods (#45500) 2019-07-28 04:34:35 -07:00
bgobandit
7c8edd2fad my life is a void 2019-07-28 00:46:40 -04:00
TheChosenEvilOne
9227c18fc2 Hardsuit helmets protect against space again. (#45524)
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-07-27 17:31:07 +02:00
nervere
d9abd3930a adds jojo hat (#45451) 2019-07-26 17:42:56 -07:00
AarontheIdiot
e819a661e7 Removes plasma man welding/flash protection (#45369)
* slows plasmen by .5

* removes plasmeme flash and welding protection

* the accursed speedmod 0.5 is gone, welding goggles are available at autolathey

* removed a redundant line

* adding welding goggles to autolathe will be moved to a different PR
2019-07-27 00:15:09 +02:00
nemvar
fa0c53f89b This var didn't exists. (#45510) 2019-07-26 16:10:02 -04:00
MMMiracles
cded323274 Adds Hat Throwing (#45355)
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
2019-07-26 15:23:56 -04:00
tralezab
fe0f959956 Remove an overused neme from the game (#45421)
grow up you fucks
2019-07-24 18:02:41 -07:00
Qustinnus
b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
Qustinnus
c80185421f Adds techpriest robes and adds them to the RoboDrobe (#45365)
* start

* techpriest

* contraband

* ass
2019-07-24 03:35:38 -07:00
tralezab
3b49b5378d Yet Another Fugitives PR: Bounty Hunters, Features, Fixes, Treason, Removals! (#44802)
* mostly fixes in this commit

* removes old_god from the dme

* russian shuttle improvements

* TODO: fix the hook gun

* shotgun finished, next commit shuttle

* bounty hunting shuttle

* back up to speed on the dmis

* readds poster 46 and adds the shuttle finally

* dmi fixes

* traps need fixing, work out whatever is happening with synths

* super final touches, see desc

map ports + proper spawners, pinpointer and traps functional. other misc changes

* removes verb stuff from non verb stuff

* review (see desc)

antimagic checks and it now the two objects move inside each other instead

* dmi conflicts

* PLUNGERS. BEGONE.
2019-07-22 20:00:34 +02:00
MadoFrog
13d34034c3 Adds an award for the HoP to give (#45290) 2019-07-21 16:10:41 -07:00
Twaticus
2b4c123fc0 Skirt Update (#45244)
About The Pull Request

Some skirt sprites were offset i dont know how this happened i swear i fixed this before but apparently not. Fixed the assistant skirt necklines being way too high. Added extra details on some skirts.
Added 5 previously missing skirts including 2 lawyers skirts(like they dont have enough already), rainbow, syndicate and tacticool. Fixed the disorganized mess that was the Lawdrobe.
Why It's Good For The Game

Updated skirts good. Rainbow skirt good. Skirtleneck good.
Changelog

cl
add: The long lost rainbow jumpskirt has been found
add: Rumor has it that even the syndicate have started producing skirts for their operatives
tweak: Department skirt necklines are more in-line with their jumpsuit counterparts, sprites are no longer offset, added detail
/cl
2019-07-19 22:39:41 +12:00
Alek2ander
3e68107d96 Fixes interaction between job-based IDs and agent cards (#45176)
* Job IDs and agent card fixes combined

* Fixes random wallet icons being visible
2019-07-15 02:51:45 -07:00
Alek2ander
4e26573f7b Job specific ID cards (#45112)
* Job based IDs attempt one

* This doesn't actually work

* Back to overlays

* The Comment Section

* Cached flat icons
2019-07-13 21:24:35 -07:00
Alek2ander
2ef094765d Chameleon ID and PDA improvements (#45113)
Chameleon IDs and PDAs will automatically update names and icons when
changing disguise. They will also change the displayed job when
switching outfits with the chameleon combo-action.

Chameleon IDs and PDAs reset to the default name if their appearance
changes and need to be updated manually to display the proper label,
which seems like a waste of time to me. Changing the entire chameleon
loadout is very sneaky and setting the appropriate job on the ID and
PDA makes it sneakier.
2019-07-13 19:39:29 -07:00
Dax Dupont
b04ba54230 Disables adjust on burial garb 2019-07-12 19:32:53 +02:00
nemvar
66af98e75a blocks shove knockdown is now a clothing flag. (#45107)
* blocks shove knockdown is now a clothing flag.

* comment only commit
2019-07-11 12:21:22 -04:00
Emmett Gaines
328fc7b1f1 Adds elements: Lightweight shared components/Global components (#44817)
If you came here thinking this was some game feature then you are in the wrong place. Here is where I ramble about code.

This adds /datum/element as a sort of sibling to components. Only one of each type gets instanced and they do not get tied directly to any particular thing like a component does. Basically they're a very lightweight component for doing simple functionality that doesn't have much state.

Originally this concept came about as a kind of component that could be shared between many parents to reduce some resource costs. Doing this would allow us to componentize more behaviors that are a part of too many things to be viable to have a whole component for every single one. For example a component on every space turf would be entirely unviable. With elements it's much more reasonable.

This implements a prety bare framework and a couple components are migrated to it. It's ready to be used but I fully expect I'm going to need to refine how it works for all the usecases we'll want it for.

Also: this fixes the qdeleted signal. This signal isn't even possible because after qdel is done there's nothing to receive a signal anyway. I've changed it to a qdeling signal instead. I need it to work for some elements to know when to clean themselves up.
2019-07-09 11:26:51 +12:00
oranges
37fdfee08a Merge pull request #44843 from Garen7/removeHygiene
Removes Hygiene
2019-07-08 21:53:08 +12:00
RandolfTheMeh
176bcdad93 Adds Jumpsuit/Jumpskirt Preference (#44883)
Adds a preference for jumpsuit/jumpskirt into the game. Currently runs
a jumpskirt for all occupations on spawn except for miner, since they
have their special lavaland suit, and no skirt variant I could find.
Doesn't remove skirts from lockers/machines yet since I am not 100% as
to whether that should be done (clothes are available generically for
the sake of changing outfits/recovering clothes after a whoops with
some pyrotechnics).
2019-07-05 23:38:50 -07:00
Garen Crownguard
534a9140aa merge 2019-07-05 17:59:38 -05:00
Krysonism
1edc7fb582 Add cowboy boots! (#44880)
This PR adds 6 new types of cowboy boots. Brown, black and white
cowboy boots have been added to the clothesmate. Two types of lizard
skin boots can be crafted, these boots can then be exported for money.
An additional pair of fancy boots are currently unobtainable, but will
be part of a future project. Cowboy boots can now act as shelter for
some type of snakelike creatures, fill a pair with snakes as a prank
or harebrained assassination plot.
2019-07-05 12:08:22 -07:00
pireamaineach
e8686b0f96 Add mime and clown plasma-envirosuits (#44881)
- Added mime envirosuits, nothing special here.
- Added clown envirosuits, which release space lube when they
  extinguish the clown.
- Removes code that theoretically limits plasmamen from being clowns
  and mimes, but actually doesn't.
- I guess the roles now spawning with these suits is kind of notable.
- Reverts unlisted changes to the grey detective suit from #44776.
2019-07-04 22:34:59 -07:00
RandolfTheMeh
e9dab4c665 Universal Organ Damage system (#44710)
About The Pull Request

So organ damage is a thing now associated with general object of organ, meaning all organs inherit a damage variable, failing boolean, healing variable, and maxHealth variable. The proc applyOrganDamage takes in the damage and organ path, applying damage/healing to said organ. While an organ is in use, it heals a small amount over time (granted the organ is not failing), with this fraction being set by the healing variable.

This also reworks preexisting organ damage systems to function more so on the universal organ damage system, the liver specifically. So much code exists in regards to eyes/blindness and ears/deafness that I'll need to go ahead and take a longer time combing through the code to get everything that can reasonably be tied to those two organs and their level of damage reworked to function off of the organ damage system, as opposed to just a trait add/remove system.

Lastly, this slightly reworks scanners, since now you need to check for every organ in the body. Since organs are stored as "the [organ]" with the method I used to get them, the phrasing on the medical scanner was changed to make more sense given it now has to say something along the lines of "severe/minor damage detected within [the organ]". I'll likely add another proc if I cannot find a way to get the organ's max health during this operation, since a static number determining minor/severe damage does not work when an organ's max health is less than the typical 100 points (as is the case with eyes).
Why It's Good For The Game

Every organ can be damaged, though not every damaged organ does anything right now. Damaged livers do the same thing as they did previously, and damaged eyes develop varying levels of vision impairments. The benefits to this PR are more for future coding projects than it is for the game currently, with no foreseeable changes to the way it's played currently.
Changelog

cl
code: Universal Organ Damage variables and procs
/cl
2019-07-05 09:40:30 +12:00
nemvar
698fb9c080 Antimagic now gets used up once it loses all charges (#44956)
Also makes the tinfoil hat load correctly if varedited in the DMM.
2019-07-04 13:04:20 -07:00
nemvar
53d4c3f25a Refactor mob can_see_reagents (#44934)
Turns the scan_reagents var into a clothing flag.
2019-07-04 00:09:01 -07:00
MadoFrog
028383c378 Add mech pilot suit pack to cargo (#44811)
Adds the mech pilot suits featured in Neon Genesis Evangelion as
costumes cargo can purchase. More costumes are always fun.
2019-07-02 16:59:01 -07:00
ShizCalev
6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00