Commit Graph

2034 Commits

Author SHA1 Message Date
AnturK
12f64e4637 Adds missing armor to accessories (#38800) 2018-06-30 15:04:21 -07:00
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
ShizCalev
f338f09207 Cleanup & corrections 2018-06-20 21:57:17 -04:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Hyacinth
fe1b73f070 Adds pink scarf to vendomat 2018-06-18 10:01:28 -07:00
Jordan Brown
0a7fb53a3c Merge pull request #38518 from AutomaticFrenzy/patch/uplinks
Block default interact when opening an unlocked uplink
2018-06-17 12:13:56 -04:00
ShizCalev
6d558b6bcf puts a / at the start of some obj instances (#38545) 2018-06-17 19:10:06 +03:00
Tad Hardesty
d1161404db Change nuclear uplinks to not be radios 2018-06-15 19:36:44 -07:00
ninjanomnom
d483ff3ef0 Regexes
`([^_\.])SendSignal\((.+?)\)` -> `\1SEND_SIGNAL(src, \2)`
`([\.\w]+?)\.SendSignal\((.+?)\)` -> `SEND_SIGNAL(\1, \2)`
2018-06-13 19:19:23 -04:00
oranges
124d9b081c Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes
Give plasmamen their plasma suits in VR
2018-06-12 11:46:26 +12:00
ShizCalev
753752180c Makes swimsuits underwear (#38372) 2018-06-10 22:13:51 -07:00
kevinz000
c38e4c938d Make incendiary armor aspawn only (#38370) 2018-06-10 02:56:39 -07:00
Tad Hardesty
8c515d8d99 Give plasmamen their plasma suits in VR 2018-06-09 01:17:14 -07:00
ShizCalev
340f266ece Revert "Makes swimsuits underwear options" (#38371)
This reverts commit 24685cd93c.
2018-06-09 04:21:57 +03:00
ShizCalev
24685cd93c Makes swimsuits underwear options 2018-06-08 21:16:56 -04:00
Kraseo
a957153024 a slippery slope into h*ck (#38303) 2018-06-07 21:00:17 -04:00
ShizCalev
31654bb57c Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-02 14:04:26 -07:00
vuonojenmustaturska
c65a99f130 Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 11:36:31 +02:00
Dax Dupont
3c8493b5e0 Fixes some minor bugs with the syndicate trainer and IDs (#38127) 2018-05-29 12:09:15 -04:00
Armhulen
5d826f2ca4 Custom Chaplain Armor Kits (#37569)
* giant dad set

* twop underway

* initial

* initial

* no special armors :((((

* bye twop

* no more special armors

* f

* more removals

* fixes

* normieizing the armors pt1

* ok, finally

* I'M DONE I DID IT

* removals

* this will not compile but next commit in two commits it will

* this will not compile but next commit it will

* it compiles 20 dollars says it compiles

* i am so sorry

* fixes everything, >:(

* *coughs up hairball*

* cobby's suggestion

* pbool'f fhttrfgvba

* OOOOOOOOH YEAAAAAAAH BABY

* quieter

* AH OKAY THERE
2018-05-27 13:50:59 -07:00
GuyonBroadway
218707f5d6 Ports gloves of the north star from Hippie (#37864)
* Ports gloves of the north star from Hippie

* Doing a white line

* adds customiseable warcry and sprites by Notamaniac

* star with a capital S

* Nitpick grammar
2018-05-26 15:02:24 -07:00
Dax Dupont
db2a6f6efb Gun overlays 2: Electric boogaloo. (#38003)
* Reduces selfcharge gun processing/icon work

* More efficient gun overlays, adds old_ratio var

* oh my god it was calling the egun's update_icon?

* percent proc

* Attachment overlay overhaul

* Cut overlays in egun update

* ebow 1000% better overlay management

* Update gun.dm

* Pointless check

* Giving KA and children consistent icon behavior

* Update kinetic_accelerator.dm

* Fixed

* ..() readded

* ..() readded

* ..() readded

* Antur didnt catch this one heck

* Because confusing vars are apparently more maintainable

* Gun overlays 2: Electric boogaloo

* another one

* Chameleon guns are removed

* tentacles everywhere
2018-05-26 21:45:02 +03:00
Cruix
f32533130f Added an action button to change your entire chameleon outfit at once (#37953)
* Added an action button to change your entire chameleon outfit at once

* Made chameleon stamps actual chameleon items
Added stamps to bonus chameleon items on outfits that should have them
Made clothing work with hooded suits
2018-05-24 18:10:59 -07:00
Dax Dupont
92a811ee89 Adds VR Snowdin and Syndicate Trainer/VR Update roll up (#37915)
* Adds VR Snowdin and Syndicate Trainer

* Replace var edit

* I did forget to add a few

* Adds one full outfit spawn

* internals too

* closet

* Extends same Z level check to monitor and emping

* restricted uplinks

* camera bug fixes

don't talk about the bees

outfit changes

More items

outfit fix

* Adds vr sleepers to runtime station

* More mapping fixes

* Adds telecomms to taunt your enemies

* More restrictions

* Some fixes

* badabing

* More fixes

* emag related changes

* forgot the ract

* Additions

* griff resistance mode

* minor changes

* Removes old centcom away map

* Pushes you out of VR if you try to ghost

* this is :b:roke

* this shit is not :b:roke

* as requested
2018-05-24 17:31:18 -07:00
KorPhaeron
ce4065ca3b Fixes reactive repulse armour (#37999) 2018-05-23 18:59:45 -07:00
kevinz000
8023d94b20 tesla_act refactors and balancing (#37369)
experimental: Tesla damage has been reworked to structures and objects have been worked with a linear scaling.

experimental: All tesla weapons now no longer need to hit a mob to arc lightning; however, they will no longer stun, and only hit each target once.

tesla_zap vars are now a single bitfield.
2018-05-23 13:40:03 +12:00
vuonojenmustaturska
1eccbcca18 Adds an EMP protection component, allowing ANYTHING to be protected from EMP (#37671)
The component is initialized with any combination of three flags, EMP_PROTECT_SELF protects against effects that target the object itself, EMP_PROTECT_WIRES protects against wires being messed with similar to the NO_EMP_WIRES_1 flag which this PR removes, EMP_PROTECT_CONTENTS protects against things that are inside the object like organs, internal "non-virtual" power cells and the like

This enables (but doesn't introduce) new mechanics such as adding EMP shielding at runtime to any atom, or taking it away.
2018-05-22 11:38:02 +12:00
Barhandar
9012ab82b3 Replaces adding goliath plates to clothing and APLUs with a customizable tracking component (#37525)
add: Amount of goliath plates is now shown in examine for explorer suits and mining hardsuits.


I was peeved by being unable to tell whether the armour is upgraded or not except by trying to stick more plates on it.

I think a more correct way would be to add a plate amount var to these items similarly to APLU plating and then have description mention their amount and, for added transparency, that it's possible to improve it if there's 0 plates.

Please point the errors/wrongs in it, since "current armour value minus constant divided by value each plate adds" is rather clunky code.
2018-05-14 11:55:31 +12:00
Qbopper
7779930358 added secskirts to sec wardrobes 2018-05-12 13:04:46 -04:00
Jordan Brown
1f887a47b3 Merge pull request #37782 from vuonojenmustaturska/ohno
[s] Fixes an admin unprotected var read/write exploit
2018-05-10 14:39:15 -04:00
vuonojenmustaturska
91185482fb Fixes an admin unprotected varedit exploit 2018-05-10 20:36:09 +03:00
kevinz000
8ffb7c8b4d Makes it a bit easier to see radiation 2018-05-09 16:20:11 -05:00
Ordonis
f30a2c9565 Adds a French beret! HONH HONH HONH! (#37457)
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.

Ready for merge.
2018-05-10 09:02:23 +12:00
KorPhaeron
fb42bf3ebb Anomaly Armour Research (#37558)
Why: Anomaly cores have few uses, science could use something combat related as a bribe for RnD now that they dont get any guns, and I want to see engineering pushing the engine towards near meltdown to try and harvest anomalies (would obviously need a way to make those capturable though).

I dont know where to put the node in the "web" really, so suggestions are welcome.

The reactive armour shell accepts anomaly cores to build various armours as follows

Flux - Tesla armour

Pyro - Fire armour

Gravity - Repulse armour (new in this PR)

Bluespace - Teleport Armour

Everything else - Defaults to stealth armour as a fallback
2018-05-10 08:54:30 +12:00
Firecage
7ff845f372 Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values. (#37683)
* removes the block chance from the Roman Shield.

* replaces the Roman Shield in the autodrobe with a toy version with no block chance.

* replaces the armoured roman helmets from the autodrobe with fake ones.
2018-05-09 07:48:57 +02:00
FrozenGuy5
36fd7d424e Makes eye of god lava & fire proof (#37710)
* Makes eye of god lava & fire proof

* eye of god is fire and lava proof
2018-05-08 14:21:22 -04:00
Fox McCloud
76cb1cf060 Fixes Several Machines Materials Insertion (#37432)
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
2018-05-04 11:40:46 +02:00
ShizCalev
ba1030f803 Makes more messages pronoun sensitive (#37582)
* Makes more messages pronoun sensitive

* Some cleanup

* more pronouns

* rever
2018-05-03 18:45:55 -04:00
vuonojenmustaturska
fd4c753a04 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 (#37597)
* kill BANG_PROTECT_2

* let's put this back in

* dirty

* kill OMNITONGUE_2

This is a write-only variable, probably leftover from some refactor years ago

* kill flags_2
2018-05-02 14:13:41 -04:00
vuonojenmustaturska
3eb30b16f3 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use (#37530)
code: HEALS_EARS_2 is removed in favor of the earhealing component

code: wearertargeting component is available to subtype for components that want to target the wearer of an item rather than the item itself
2018-04-30 10:32:59 +12:00
ShizCalev
386f1ad622 Fixes invisible turtleneck alt state 2018-04-29 10:06:44 -05:00
oranges
4f9006681e Revert "You can no longer equip pet collars on humans"
This reverts commit 7935f2b407.
2018-04-28 23:19:58 +00:00
oranges
e2f617e962 Merge branch 'pets' into upstreamunsafemaster 2018-04-28 23:18:59 +00:00
oranges
d30da792ce Merge remote-tracking branch 'upstream/master' into pets 2018-04-28 22:58:09 +00:00
Jordan Brown
e402a6c9ac Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 15:55:56 -04:00
vuonojenmustaturska
98f8ca7553 Moves several clothing-specific flags from /atom to their proper type (#37486)
* lavaproof

* more flags

* it compiles

* Remove a couple of lists
2018-04-28 13:22:28 -05:00
ShizCalev
cda6c6662c Fixes a number of missing icons 2018-04-27 15:36:42 -04:00
AnturK
52a99c09d6 Uppercase slot defines 2018-04-27 10:38:32 +02:00
AnturK
4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Fox McCloud
057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00