Commit Graph

1621 Commits

Author SHA1 Message Date
kevinz000 a7975c667b Update flightsuit.dm (#25219) 2017-03-19 16:00:28 +01:00
Lombardo Paredes a01eda01e1 Add handicons for the winter coats (#25261)
* Add handicons for the winter coats

Redid the PR because merge conflicts.

* Add item_states
2017-03-18 21:30:03 -04:00
Lexorion 76dbaea8dc Gives the swat mask unique inhands (#25255) 2017-03-18 19:32:26 -04:00
Lombardo Paredes 63293d60f5 Add inhand icons for security winter coat (#25245)
Add inhand icons for security winter coat
2017-03-18 15:49:28 -04:00
Lexorion f35b8cd8a9 Gives the sechailer unique inhands (#25232) 2017-03-18 11:28:50 -04:00
Remie Richards 0b6d5fc6df Dynamic hair! (#25114)
* Dynamic hair!
2017-03-17 16:05:02 -03:00
MrPerson 0f4649bc9c Fixes hardsuit helmet lights (#25050)
Fixes #24894
2017-03-14 12:25:09 -04:00
coiax cb38468e0c Merges HEADBANGPROTECT and EARBANGPROTECT into new secondary flag (#24881)
Unless we get a clothing item that can be worn on the head, and the
ears, and only protects from loud noises in one of the configurations,
this isn't going to be an issue.

Frees up another flag slot, all hail the secondary flags.
2017-03-13 22:00:43 +13:00
Lzimann 5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Steelpoint 6ab7ba871f Bulletproof(Tactical) Armour + Vest Defence Tweak (#24816)
One issue that has been bugging me for a while is the inconsistant bullet defence of the Bulletproof Vest and Helmet.

Currently the vest has 80 bullet defence, but the helmet has only 40 bullet defence.

In the interest of fairness (since people will think I'm just buffing security), I've fixed this by buffing the helmet, and nerfing the vest, to have 60 bullet defence.

Thanks for reading.

🆑 Steelpoint
tweak: Bulletproof (Tactical) Armour has had its bullet defence tweaked to be consistent between both the helmet and vest variants. Defence is now at 60.
/🆑
2017-03-10 09:47:40 +13:00
kevinz000 ceb65bd66b [READY]Chameleon gun projectile disguising (#24574)
* this'll end well

* hmm

* double hmm

* prevents emp crash

* why am i getting things wrong reee

* done

* .
2017-03-08 21:56:25 +01:00
Supermichael777 f7a38c2113 Adds a Chameleon belt (#24569)
* adds a mildly evil belt

* adds the belt to a kit that sorely needed it
2017-03-07 09:10:36 +01:00
kevinz000 7cb0ca9a92 Update flightsuit.dm (#24681) 2017-03-06 16:28:15 -06:00
PJB3005 64db72a150 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-04 16:31:55 +01:00
oranges fef88121cc Merge pull request #24597 from Supermichael777/Uniform
adds unique discriptions to the grey sec uniforms
2017-03-04 23:36:07 +13:00
PJB3005 a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
Supermichael777 a28087fb74 adds unique discriptions to the grey sec uniforms 2017-03-01 20:03:17 -05:00
AnonymousNow db7a8e3510 Adds Jamjar Glasses (#24373)
Now's PR experiments #3: Adding an item to a vending machine. Part of a series of tests for me to figure out how the code works a little better.

These are Jamjar Glasses, so called because they're as big and thick as the bottom of jam jars. They're a comical "fashion" item alternative to regular prescription glasses, with all the same functionality. They appear in the Clothesmate vending machine, where they replace one of two existing pairs of prescription glasses.
glasses

🆑
add: Nerd Co. has sent pairs of thicker prescription glasses out to Nanotrasen stations, for your local geek to wear.
/🆑
2017-02-25 15:53:47 +13:00
AnonymousNow ab9724f1e0 Adds Medical HUDGlasses (#24096)
* Adds Medical HUDGlasses

Adds sunglasses with a built-in medical HUD. Functions as you would expect them to, tested locally with no issues, comes in a stylish blue.

I've wanted these for literally years, but I've only sat down and worked out vaguely how items and PRs work this week, so here they are. They haven't been added to any map yet - that's a debate itself - but I'm hoping to find an opportunity to test them, perhaps being ERT Medical Officer standard equipment before a single pair is put in medbay to fight over.

Lemme know what you think.

* Hopefully moves hud.dm to its intended place.

Root folder indeed. WTH, Git?

* Glasses.dmi in the wrong place

Yep.

* eyes.dmi in the wrong place

Alright.

* Re-adds eyes.dmi in the right place

Well, guess Git's not as smart as I hoped.

* Re-adds glasses.dmi in the right place

LET US NEVER SPEAK OF THIS AGAIN.

* Deletes the old hud.dm to take place for the new

This'll all be cleaner next time.

* Moves hud.dm to where it should have been in the first place

Second PR ever, everybody!

* Adds Inhands for sunhudmed and sunhudsec

Oops. Forgot the inhand sprites. While I'm here, let's give security HUDshades their own inhands - they use the generic shade inhands otherwise, it seems.

* Tweaks shading on sunhudmed

Makes it like my original concept image which I just found again (over four years old!); now it makes a little more sense and looks better.

* Tweaks colour on sunhudmed to be a little more distinct
2017-02-22 13:34:49 +01:00
Cyberboss 56a6eaa8e6 Overlay queuing (#23922)
* Overlay queuing

* Fix SS flags

* Don't copy on assignment

* Flags processing

* Fix icon_smoothing

* MSO's helper proc

* Legacy detection

* Make it work

* Fixes shitcode

* Fix the flag

* |= -> +=

* OK, how did I fuck that up?

* shitcode

* Conditional assoc queue while initializing

* Cleanup everything

* Orange meme

* This isn't perfect, but its the best byond will give us.

* forgot about dir

* oh ya

* This was litterally the last thing i did last night before heading to bed

You can tell can't you?

* Fixes various shit

* Let's not ever pause

* Fix the flag

* Cleaned up some missing shit. Added image dummys

* Remove the one usage of FPRINT

* Jesus get rid of this
2017-02-22 21:44:55 +13:00
Pieter-Jan Briers b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
kevinz000 9413f0855b [READY]Flightsuit Fix (#24026)
* Update flightsuit.dm

* Update flightsuit.dm

* Update flightsuit.dm

* forceful pulling

* woops

* working
2017-02-16 15:06:38 +01:00
Steelpoint 46fae8ed6c Security Internal Jetpack (#23898)
* InitialCommit

* SecurityJetpack

* MoveToSuitStorage

* MergeConflict

* LeftAndRightInHands

* MergeConflict2

* InternalJetpack

* MergeConflicts3

* MergeConflict4

* MergeConflict5
2017-02-15 22:43:06 -06:00
oranges b45d26b0f8 Merge pull request #24022 from MrPerson/FILES_go_in_SINGLE_QUOTES_you_fuckwits
Puts files in single quotes like they belong
2017-02-15 00:57:28 +13:00
Cyberboss d27899ce64 Unequip refactor fix pack (#24040)
* Fixes drag drop deletion

* Fix it for clothing as well

* Do it properly

* Various other incap checks I noticed from the unequip refactor

* Time to generalize this shitty shit

* PADDLING!!!

* A whole bunch of ree
2017-02-14 08:52:56 +01:00
PJB3005 f11c558c99 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-12 16:35:57 +01:00
MrPerson 9dd81f1da8 Puts files in single quotes like they belong
This means they're included into the rsc and sent out althogh almost all of these files were already included elsewhere. Also DM will yell if the file couldn't be found for whatever reason like if someone moves or renames it.

I left out some file types for various reasons
dmis used in overlays: I have another pr I'll do later which will fix all of them and I don't want to conflict with myself
text files: they would get included in the rsc, which is completely unnecessary. However they're small, so they might be worth including anyway
2017-02-12 07:15:18 -08:00
kevinz000 c97e0041c6 [READY]Makes the reactive tesla armor actually shoot out lightning (#23719)
* lel

* Update armor.dm

* Update armor.dm

* Update armor.dm

* Update energy_ball.dm

* Update living_defense.dm

* Update carbon_defense.dm

* Update human_defense.dm

* Update carbon_defense.dm

* Update armor.dm
2017-02-10 20:19:29 +13:00
oranges 8e0c8a7ced Merge pull request #23807 from Supermichael777/tiki2
Removes meta, delta and pubby as unmaintained
2017-02-09 16:27:20 +13:00
PJB3005 3c8b98a3aa 9/11 2017-02-08 15:07:58 +01:00
PJB3005 8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
danno "big fucking moron" gonzales 3e5108f4ee new coat of paint: colored jumpsuits (#23786)
* redone colored jumpsuits

* purp scurp

* weehawwww
2017-02-07 16:32:35 -06:00
Cyberboss 9ab72ea6c9 Fixes a runtime qdeling hooded outfits (#23789) 2017-02-07 16:29:50 -06:00
Supermichael777 aeaad4631b til how action buttons work 2017-02-07 00:19:29 -05:00
Pieter-Jan Briers 43fd486f82 Adds a hook for changing view size. (#23690)
* Adds a hook for changing view size.

* """"coding standards""""
2017-02-06 01:01:12 +13:00
Cyberboss b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
SweaterKittens f3383c7f22 Plasmamen Gear Sprite Tweaks and Helmet Light Re-Addition. (#23685)
* Re-adds Plasmamen Helmet light, and tweaks almost all related sprites. Additionally, adds myself to the .txt for testing purposes.

* Update tgstation.dme

Not sure why this got changed, fixing.
2017-02-05 15:56:54 +11:00
Cyberboss 36507d6a12 Fixes /obj/item/clothing/head/hooded failing to GC (#23560) 2017-02-02 11:32:19 +01:00
ma44 793686474f [NEW] Scientist's jumpsuit description changed to match the defenses (#23585)
* Update medsci.dm

* Update medsci.dm
2017-02-01 22:42:31 -06:00
oranges 7a9b7ffe2f Merge pull request #23503 from ChangelingRain/eyewearfix
Fixes glasses toggling
2017-02-01 15:56:31 +13:00
Cyberboss 3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
oranges 9f02e219a4 Merge pull request #23434 from coiax/revhead-camohud
Revhead camoHUDs + syndicate thermals are now full camoflage items
2017-01-31 09:19:27 +13:00
Joan Lung 0fbde400e5 Fixes glasses toggling 2017-01-30 11:31:00 -05:00
Militaires 61cd5bfeff Sailor outfit (#23401)
* there we goo

* REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

* memes

* eat my ass merge conflict
2017-01-30 10:30:20 +13:00
Robustin 355c5c8085 Security Suit Sensors are maximized by default (#23386)
* Sexily sets security suit sensors so sensible samaritans see suspicious scenarios

* Captains too
2017-01-30 10:19:43 +13:00
Supermichael777 17f6284d8d Ports Tiki mask from Hippie and adds the alt version of the wooden chair to the crafting menu. (#23161)
tweak: The wooden chair with wings is now craft-able. -1 non reconstruct-able map object

add: Added the Tiki mask, you can make it in wood's crafting menu.

imageadd: Ported Tiki mask's sprites from Hippie station. It is under the same Creative Commons 3.0 BY-SA as the rest of our sprites. They are from Nienhaus.

For the mask the reason is UNGA-BUNGA. For the chairs I just hate map objects that players can't fix.
2017-01-30 09:47:06 +13:00
Jack Edge d30bb4e97a While we're here, do thermals as well 2017-01-28 23:05:00 +00:00
Jack Edge c06d9aa193 Revhead camoHUDs are now full camoflage items
🆑 coiax
add: Camoflaged HUDs given to head revolutionaries now function the same
as chameleon glasses in the chameleon kit bundle, giving them an action
button and far more disguise options.
/🆑

- inb4 the revhead runs around with ratvar or cultist blindfolds on
2017-01-28 22:46:07 +00:00
SweaterKittens 593ed02f01 Changed the name of the extinguisher refill and included a file that was left out of the previous commit 2017-01-25 12:28:44 -08:00
SweaterKittens 11d2b5c417 Updated names and desc for all Plasmamen related items, including the jumpsuit, helmet, formerly used suit (Now EVA suit), internals tank, and suit extinguisher refills. 2017-01-25 12:07:11 -08:00