Commit Graph

297 Commits

Author SHA1 Message Date
pubby ab211e164b Fix kitty ear color (#30374) 2017-09-04 14:17:48 +02:00
Fury McFlurry 2747742ce1 added code for costume hats 2017-08-31 12:37:11 +02:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Ian Turk 1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Ian Turk 371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
shizcalev 22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
kingofkosmos e526e736f4 Fixes hair sticking through hats. (#29651)
This is done by using the dynamic_hair flag. Dynamic_hair set to nothing wherever the hair needs to stick through (kitty ears etc).
2017-08-06 20:12:24 +12:00
shizcalev 1c69895b87 spellchecked code/modules 2017-07-31 11:18:32 -04:00
KorPhaeron bda0a5fe80 Changes mummy bandages and scarecrow sack to masks 2017-07-27 13:15:38 -04:00
KorPhaeron cf42373acb Costumes 2017-07-23 21:01:44 -04:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Steelpoint f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00
Xhuis 27c665bfb5 Variable renames, some sets 2017-06-19 11:17:15 -04:00
Thunder12345 93a6dcb02e cats 2017-06-12 17:49:28 +01:00
Lzimann 3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
Expletive 78473ac024 Resprite fedoras, Curator and Detective hats are now subtypes of fedora. All benefit from hair extensions 2017-06-07 09:03:19 -07:00
Expletive c18492d87f I never want to do that again 2017-06-06 22:26:39 -07:00
WJohn f6063b936f Adds some more syndicate equipment. (#28046) 2017-06-05 15:50:11 -03:00
WJohn 5c3b433489 New syndicate cosmetics, turfs, and spawners. (#27760)
* Loads of syndicate battlecruiser related content. Clothing, turfs, areas, and a few mob spawners.

* Moves new plaque turfs and all other ones to a new plaques dmi.

* does what joan asked

* whoops forgot to add some dmis and delete one

* Adds syndicate energy turrets.

* PROBABLY STILL OKAY

* Unticks file dir?

* Forgot to remove extra sprites in shuttles.dmi since they're now in proper dmis of their own in full size.
2017-05-28 18:02:33 +01:00
Expletive 27e64083e9 Tweaks the curator's access and clothing to improve his treasure hunting ability (#27013) 2017-05-09 16:37:11 -03:00
KorPhaeron b7864be38a Curator 2017-05-03 08:08:14 -04:00
coiax afd9b4a88d Maintenance loot cleanup (#25448)
🆑 coiax
fix: All tophats, rather than just the ones in maintenance, hurt a tiny
bit if you throw them at people.
/🆑

- All tophats have throwforce 1
- Cable coils are now random colours
- Cable coils now actually come in stacks of 5 in maint
2017-03-30 09:03:15 +13: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
PJB3005 8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01: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
PJB3005 7356e80484 hey that should be everything except making it compile. 2017-01-17 22:08:27 +01:00
Mervill 00f6fdd1f2 Removes two instances of nonlatin characters in name/desc text (#22659)
* Removes two instances of nonlatin characters in name/desc text

* avoids trademarks, eh
2017-01-03 13:52:05 -05:00
Firecage 75f157e099 Fixes not being able to drink/eat with visor-up Riot Helmet. 2016-12-26 17:20:35 +02:00
KorPhaeron e6c8183afd Merge remote-tracking branch 'refs/remotes/tgstation/master' into borghats 2016-12-16 09:50:10 -06:00
KorPhaeron f3fdbf4aff Borghats 2016-12-15 21:46:05 -06:00
Joan Lung b2fcbabb0b You can now push Wraith Spectacles up (#22188)
* You can now push Wraith Spectacles up

* you need to... actually LOSE the xray vision

* Don't flicker toooo much

* for bonus points, let's us refactor status effects while we're here

* might as well keep that around
2016-12-16 10:59:26 +13:00
KorPhaeron 0e8a1d975d These things also belong in a museum (#22139)
* Curator Items

* Spawns in his bookbag because where else would this stuff go

* Revert "Spawns in his bookbag because where else would this stuff go"

This reverts commit c3a8613b01a8ac99b0d44e7eeb2e69fa8ca5801c.
2016-12-15 13:40:30 +13:00
danno "big fucking moron" gonzales be20da226c Chaplain costumes and theater masks (#22109)
Ah hah hah ha! Ooh! Majestic! A hunter is a hunter, even in a dream. But, alas, not too fast! The nightmare swirls and churns unending!
2016-12-11 22:48:11 -05:00
oranges b2d1cb332e Merge pull request #21923 from ExcessiveUseOfCobblestone/helmfix
Hotfix: Sechelm Button Edition
2016-12-06 10:34:26 +13:00
ExcessiveUseOfCobblestone 18373720d0 Fixes Sechelms 2016-12-03 19:30:15 -05:00
Mervill 19513c398c updates 2016-12-02 19:38:02 -08:00
Mervill 09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
uraniummeltdown 4a7349b0f9 Adds a few clothing items and remove access req from AutoDrobe (#21488)
* Adds joy mask, cueball helmet, scratch suit, removes req_access_txt from AutoDrobe

* access req is back :(
2016-11-13 16:33:05 +13:00
PKPenguin321 ee0a3ca1fe fixes an accidental removal (#21452) 2016-11-10 15:20:39 -06:00
Mervill 9ea955b85f Lint (#21393)
* icon, icon_state defined twice

* desc defined twice

* desc defined twice

* desc, icon_state defined twice

* icon_state, name defined twice

* item_state defined twice

* gender defined twice

* stop_automated_movement_when_pulled defined twice

* attacktext defined twice

* speak_emote defined twice

* flying defined twice

* item_state defined twice

* speak_chance defined twice

* attack_sound defined twice (x2)

* icon_state, item_state defined twice

* icon_state defined twice

* Revert "desc defined twice"

This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.

* desc defined twice

* Revert "desc defined twice"

This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.

* desc defined twice
2016-11-08 13:55:30 +13:00
phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
phil235 1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +02:00
yackemflam 0ae63e71ef Because mso said so 2016-10-19 21:52:05 -07:00
phil235 029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm
2016-10-19 01:56:02 +02:00
phil235 240f3a4c49 Adding var/list/atom_colours to /atom .
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.

Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
2016-10-19 01:51:30 +02:00
Joan Lung 4cddd81120 Suicide now uses the pronoun helpers (#20973)
* This doesn't actually matter, because you're dead forever once it happens...

* is this entire pr chaff for something else

* you'll do it? nah, fuck that I'll do it
2016-10-18 14:36:38 +13:00
Joan Lung ce13143d9d Replaces yet more istypes with helpers (#20806)
* uses more istype helpers

* oranges is inefficient
2016-10-10 17:48:35 +13:00