Commit Graph

31 Commits

Author SHA1 Message Date
phil235
fd16e02cdb Fixes most (non hardsuit) helmets hiding the glasses when they shouldn't.
Fixes not seeing glasses through the riot helmet.
Fixes gas mask protruding from the abductor helmet.
Fixed radiation hood not hiding your hair, earpiece, mask.
Fixes colored justice hats not having an on-mob icon_stat.
Removed BLOCKHAIR bit from var/flags , moved it to flags_inv and renamed to HIDEHAIR
Added HIDEFACIALHAIR bitflag so certain hat/helmet can show just the beard.
Fixed human/update_inv_glasses not checking if our mask hides our glasses.
Fixed check_obscured_slots() not checking if our masj obscur our glasses.
Fixes some bits of flags_inv having the same value.
Fixes crusader hood and other headgear not hiding your identity when they should.
Fixes drone mask icon not appearing.
2016-02-14 00:03:07 +01:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Nerd Lord
cd249d41f3 Slimes can no longer feed on simple animals that are immune to clone and toxin damage
Simple animal damage procs return the damage done(as one would expect)
2016-01-20 15:38:58 -05:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Nerd Lord
4815a0f37c Simple animals no longer convert other damage types to brute using the brute damage proc, allowing you to make mobs immune to brute but not all damage types.
No, no, do it properly not half-ass it
2016-01-04 15:29:23 -05:00
Incoming5643
4c25db479b buffs out a few of the bigger holidays celibration periods 2015-07-24 13:21:02 -04:00
Incoming
11d1a6c91f Adds a few holidays to the holidays datum
Adds station prefixes for a few holidays
Holidays will now actually happen on their relevent days again, and not over a long period of time that kind of ruins the point of it being a holiDAY
Space Station 13's birthday will now actually announce how old the game is
2015-07-20 14:52:45 -04:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Remie Richards
0611c9b3bb Adds a category for food items, adds some missing weapons and a Misc category 2015-06-25 11:58:42 +01:00
AnturK
ac4b76ac52 Fixes #9257 2015-05-05 18:50:30 +02:00
Firecage
ad75060280 Changes how butchering works. 2015-04-29 20:06:20 +02:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
phil235
afef61aa58 Fixes the meat type of many simple animals
Fixes the name of some steaks and cutlets when spawned.
2015-04-11 14:18:32 +02:00
MrPerson
719b3e6da9 April Fool's lasts only 2 days plus another holiday
New holiday for SS13's birthday. Or at least when it was listed on the BYOND hub, close enough.
2015-04-04 03:33:11 -07:00
Sawu
3dc6a83198 Fix-it-Phil
Fixes the broken spacebbits
2015-03-29 06:17:25 +11:00
Swag McYolosteinen
eca852a8c1 Merge pull request #8569 from sawu-tg/easterevent
Easter is Out!
2015-03-28 19:32:49 +01:00
Cheridan
17067d9021 Merge pull request #8508 from phil235/SlimeAnimal
Life refactor and slime as animal
2015-03-27 13:38:16 -05:00
Sawu
094e974798 * Adds some delicious easter food (Mammi, Chocolate Bunnies, Hot cross buns and Brioche)
* Fixes invisible suits
* Adds rabbit ears to the egg drops.
2015-03-27 23:14:33 +11:00
Sawu
ca38dfae9e Fixes a wrong name. (Copypasta is bad) 2015-03-27 20:56:30 +11:00
Sawu
c208a467fc Easter is Out!
*Chickens have been refactored to be entirely interchangeable
*Rabbits have been added, they will bounce around and place eggs, even in space!
*A Rabbit Suit has been added, and can be won from opening easter eggs!
*A Easter Basket spawns in the tunnels, allowing for easy carry of Easter Eggs!
*Easter Eggs will spawn in maintenance
*Easter Baskets also spawn in maintenance.
2015-03-27 20:52:24 +11:00
MrPerson
ce13faed09 Change select holiday names to #defines 2015-03-25 15:01:06 -07:00
MrPerson
9910cf3fe3 Change holidays into datums
Holidays are now actual datums with procs and vars and everything.
Holidays run a proc called celebrate() when it's time to celebrate them. Currently none of them do anything but that should change, wink wink.
Holidays can now run for more than a day. The important ones, april fools, christmas, halloween, new years, and easter, all last at least a week. The idea is so people can celebrate christmas in game without having to, you know, actually play on fucking christmas. And also to put a time limit on how long stuff like the annoying spookoween closet skeletons will stick around so it doesn't overstay its welcome and become annoying as shit like last year.
The event SS now allows more than 1 holiday to run at a time. This matters for new years + christmas, easter + april fools, easter + 4/20, and any holiday that can happen on friday the 13th. The events get stored in a list that's only initialized if there's an active holiday so testing for potential holidays is still pretty easy.
Added more easter dates so we won't have to add more until 2040. The current batch run out in 2017.
2015-03-25 01:46:29 -07:00
phil235
98f9916317 Yet more work on slime procs and life subprocs. 2015-03-21 20:44:32 +01:00
Miauw
eedf8aaf7c Spookoween should be mucho bettero now 2014-11-04 19:11:23 +01:00
Miauw
c4d07ee503 Makes spookoween things a bit nicer. 2014-11-03 20:26:04 +01:00
Miauw
0cadefd855 Nothing to see here, continue with your planned spooking, citizens. 2014-10-31 21:52:10 +01:00
Miauw62
9a378933d2 Makes spookoween compile 2014-10-25 11:40:53 +00:00
Miauw62
64ee84889d Merge branch 'thespookisreal' of https://github.com/Menshin/-tg-station into thespookisreal
Conflicts:
	code/modules/holiday/halloween.dm
2014-10-25 11:23:32 +00:00
Menshin
c15c3415a8 Spooky closets : non code invasive edition 2014-10-15 14:55:43 +02:00
Swag McYolosteinen
fc9fbbd19c Actually adds the spooky halloween content by sawu.
Somehow it didnt make it in properly vOv
2014-10-11 13:36:51 +02:00
Miauw
ae23274acf Adds spooky halloween content by sawu.
- spooky skull and coffin cookies
- trick-o-treat bags
2014-10-06 18:32:32 +02:00