Commit Graph

15989 Commits

Author SHA1 Message Date
Iamgoofball 3d61826a6a Fixes *flip 2015-03-28 23:04:50 -07:00
Fayrik 7336e6ecb8 Call Centcom! ERTs got fixed! 2015-03-29 03:54:54 +01:00
Fayrik 4f43fff199 Issue fixes! All that, and more! 2015-03-29 03:54:41 +01:00
NikNakFlak 89defc1d8b Adds the ability to shave all types of corgis, including ian, lisa, regular corgis, and corgi puppies. 2015-03-28 19:24:13 -07:00
phil235 a127c9403a Merge pull request #8553 from GunHog/Helmet_Fix
Fixes #8541
2015-03-28 23:35:19 +01:00
phil235 2ef01a61c5 Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free.
Fixes alien nest buckling pixel offset.
Removes resist unbuckling 'success' message so there's not two unbuckling messages.
Fixes objects with buckling not unbuckling its buckled mob when the mob is gibbed (Fixes alien nest overlay not disappearing when larva burst and gib its host).
2015-03-28 23:02:44 +01:00
Xhuis cdca823a74 Merge remote-tracking branch 'remotes/upstream/master' into stealthy_weapons 2015-03-28 15:20:37 -04:00
Sawu 3dc6a83198 Fix-it-Phil
Fixes the broken spacebbits
2015-03-29 06:17:25 +11:00
Xhuis d209ce5235 Merge remote-tracking branch 'remotes/upstream/master' into stealthy_weapons 2015-03-28 14:42:31 -04:00
Swag McYolosteinen eca852a8c1 Merge pull request #8569 from sawu-tg/easterevent
Easter is Out!
2015-03-28 19:32:49 +01:00
phil235 c67423adf5 Fixes alien humanoids not being able to attack blobs.
Created a take_damage() proc for obj/effect/blob.
Slight adjustment of the values of damage to blobs.
Fixes typo in pod people attack message (changed the verb from "slice" to "slash")
2015-03-28 19:27:07 +01:00
Xhuis 2c988e0aea Adds pizza bomb traitor item 2015-03-28 12:45:05 -04:00
Swag McYolosteinen bdfd2a2f7c Merge pull request #8554 from RemieRichards/MonkeyHats
Monkeys can wear hats!
2015-03-28 13:47:35 +01:00
ACCount12 55d4c99da4 Icon change 2015-03-28 22:27:23 +12:00
ACCount12 edace66c47 Fix 2015-03-28 22:15:20 +12:00
ACCount12 fd3f3ab68b New pins 2015-03-28 22:02:44 +12:00
Iamgoofball ecc08a4f44 Fixes intense lag caused by the singularity 2015-03-27 19:07:53 -07:00
phil235 e80a50f1c7 Fixes not being able to put unlit welding tool in open closets and not being able to open a closet with an unlit welding tool in your hand. 2015-03-28 00:12:06 +01:00
Iamgoofball 2ec7732f90 Spinning doesn't stop until you hit something now. 2015-03-27 13:19:46 -07:00
xxalpha 55b81363cc Merge remote-tracking branch 'upstream/master' into hardjet
Conflicts:
	code/modules/clothing/spacesuits/hardsuit.dm
2015-03-27 19:35:10 +00:00
Cheridan cb23548768 Merge pull request #8533 from Jordie0608/greatpermitsbringgreatweightresponsibility
Fixes #8527, construction permit weight
2015-03-27 14:04:38 -05:00
hornygranny 8fba2cf22c Merge pull request #8551 from MrPerson/surgery_fun_removal
Disallow doing surgery on yourself
2015-03-27 11:52:00 -07: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
Remie Richards 0ad2cea133 Fire spreads evenly between 2 mobs when they MobBump() or Cross() each other. 2015-03-27 11:22:39 +00: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
Incoming 50ec2f3224 Makes the ability for wizards to use summon guns, summon magic, and summon events a config option 2015-03-27 01:32:28 -04:00
ACCount12 e37121d750 ntstation mining update 2015-03-27 15:47:01 +12:00
pudl 0964979a90 bitch says she wanna keep her throat warm 2015-03-26 21:16:25 -05:00
dannno a1138dbc37 MONKEY SKEDADDLE 2: WEEOO WEEOO WEEOO
- loop slightly improved
- added alternate WEEOO helmet
2015-03-26 19:14:38 -04:00
AnturK d376456402 - Adds simple charging visual
- Adds sound effect
- Changelog
2015-03-26 22:53:41 +01:00
GunHog 7b89713816 Fixes 8558
- Helmet crates now come with the proper helmet type.
2015-03-26 15:28:58 -05:00
phil235 f8bd5a4259 Adds a temporary fix to the conflict with metastation map.
Small fix in simple_animal life subproc.
2015-03-26 18:55:05 +01:00
Remie Richards 51a3a8b6aa Merge pull request #8535 from MrPerson/just_in_time_for_april_fools
Change holidays into datums
2015-03-26 16:46:02 +00:00
Remie Richards 5b20448e2b Monkeys can now wear hats! Monkeys can now also wear all masks, instead of the select few they had icons for (which have been removed, since they are no longer needed) 2015-03-26 15:23:52 +00:00
GunHog e0e2cdd985 Fixes #8541
Fixes https://github.com/tgstation/-tg-station/issues/8541
Hardsuit helmets and other toggles should now work properly.
2015-03-26 09:37:09 -05:00
Jordie0608 4beac828e2 removes old player panel 2015-03-26 17:30:16 +11:00
MrPerson 6881ac8c1d Disallow doing surgery on yourself
This doesn't solve the fact you can lie down with stuff in your hand (which isn't a bug imo) but it does stop people from cutting their brains out or giving themselves plastic surgery.
Fixes #4001
2015-03-25 22:17:03 -07:00
Jordie0608 1fc89cb611 removes soh singulo interaction 2015-03-26 13:19:56 +11:00
pudl 4c51941e6e reverts an accidental change 2015-03-25 21:12:25 -05:00
tedward1337 83961b85c9 Adds a new button for admins with +fun to push. Sends bluespace artillery to the station at the whim of God. 2015-03-25 22:03:45 -04:00
Jordie a86b757d93 Merge pull request #8291 from Xhuis/nerf_thermal_vision
Nerfs changeling augmented eyesight
2015-03-26 13:01:25 +11:00
phil235 7a1232012b Fixes more merge conflicts 2015-03-26 02:52:04 +01:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
phil235 92b0f9f4cd Adding a changelog.
Some work on death() procs of many animals.
Replacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ).
Some work on slime feeding procs.
Made simple animal aliens see in the dark like regular aliens (in case somone wants to control one).
2015-03-26 02:23:39 +01:00
Jordie 31a808aa6d Merge pull request #8509 from Iamgoofball/spin
Adds object spinning when thrown and *flip
2015-03-26 12:02:53 +11:00
hornygranny e92fe6c333 Merge pull request #8495 from dannno/hahaobjectionxd
adds hammer and gavel
2015-03-25 16:13:39 -07:00
pudl 69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
MrPerson ce13faed09 Change select holiday names to #defines 2015-03-25 15:01:06 -07:00