Swag McYolosteinen
d8c588867a
Merge pull request #8634 from sawu-tg/master
...
See #7217
2015-03-31 19:40:33 +02:00
Jordie
b62eb672da
Merge pull request #8618 from Xhuis/my_ears_they_bleed
...
Separates ship ambience and area ambience
2015-03-31 19:16:59 +11:00
Jordie
2d94da8e59
Merge pull request #8592 from phil235/AlienAttackBlob
...
Fixes alien humanoids not being able to attack blobs.
2015-03-31 19:11:12 +11:00
ACCount12
f10d0df8cf
Merge remote-tracking branch 'origin/master' into mining
2015-03-31 18:31:12 +12:00
ACCount12
1c219f0ebe
A lot of stuff
2015-03-31 18:30:09 +12:00
Cheridan
67d9f77ea9
Merge pull request #8600 from phil235/AlienNestFixing
...
Fixes alien nest buckling
2015-03-31 00:06:14 -05:00
Cheridan
9606763e5f
Merge pull request #8583 from Fayrik/CentcomExpansion
...
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
phil235
e88e8a4ed5
Fixes drowsyness never going down.
2015-03-31 00:27:32 +02:00
Sawu
bfd0436324
See #7217
...
* Spraycans are given to Revheads
* Spraycans act as instant use crayons.
* Spraycans can be used on walls.
* Spraycans can be used as ghetto pepper spray, but leave the target with a coloured face (can be removed with space-cleaner)
(Old pictures, there is now only one can that changes color)
2015-03-31 02:26:05 +11:00
Cheridan
caecd36d7c
Merge pull request #8552 from Jordie0608/togetwiththetimesyouwillfirsthaveotfindthem
...
Removes old player panel
2015-03-30 09:57:39 -05:00
Cheridan
724759a01f
Merge pull request #8611 from phil235/BotanyFix1
...
Two botany fixes
2015-03-30 09:51:24 -05:00
Cheridan
74d2d67280
Merge pull request #8604 from Niknakflak/NakedCorgis
...
Adds the ability to shave all types of corgis
2015-03-30 08:26:01 -05:00
NikNakFlak
010fed04c6
Spelling
2015-03-29 15:30:58 -07:00
NikNakFlak
306adf7d95
Corgi fixes.
2015-03-29 13:21:56 -07:00
Cheridan
bf36e8d040
Merge pull request #8615 from sawu-tg/npcpool
...
Updates the NPCPool to current branch.
2015-03-29 15:10:15 -05:00
NikNakFlak
a4c870669d
Code changes to corgi.dm and changelog
2015-03-29 12:44:42 -07:00
Xhuis
932cac081a
Separates ship ambience and area ambience
2015-03-29 14:49:59 -04:00
Swag McYolosteinen
8d87453501
Merge pull request #8542 from GunHog/ntsl_exSPANsion
...
NTSL Expansion!
2015-03-29 19:41:00 +02:00
Sawu
ab776cf014
Updates the NPCPool to current branch.
...
see #7012
* NPCPool will co-ordinate and organize all SNPCs, making them stronger and more intelligent.
* SNPCs can use the botPool system to co-ordinate and delegate with each other.
* SNPCs have been given factions to allow interoperability between certain types of SNPCs.
* Bots (machinery/bot) can use the system too for basic help and coordination.
2015-03-30 02:50:21 +11:00
xxalpha
66c47c98e1
Added check for inbuilt jetpack in movement_delay proc.
2015-03-29 16:15:13 +01:00
xxalpha
937aea030f
Merge remote-tracking branch 'upstream/master' into fasterspace
...
Conflicts:
code/modules/mob/living/carbon/human/species.dm
2015-03-29 15:30:38 +01:00
Jordie
d78ca0c57a
Merge pull request #8566 from Incoming5643/literal_fun_removal
...
Magic Mania NaN: The Fun Ends Here
2015-03-30 01:25:52 +11:00
Jordie
fdbef46277
Merge pull request #8543 from Szunti/mining-mobs-night-vision
...
Night vision for mining mobs
2015-03-30 01:22:53 +11:00
Jordie
c8e0c16d09
Merge pull request #8520 from MrPerson/effect_cleanup
...
Effect pooling
2015-03-30 01:21:40 +11:00
Jordie
f5cf0dd3e9
Merge pull request #8392 from xxalpha/hardjet
...
Embedded Jetpacks
2015-03-30 01:21:05 +11:00
Jordie
98873da060
Merge pull request #8549 from tedward1337/Ohgodthisishard
...
Adds Bluespace artillery button.
2015-03-30 01:20:45 +11:00
Remie Richards
2dec0e8fa4
Fixes Hat removal code by reticking carbon/inventory and moving carbon inventory code back there. (Mystery coder who undid this, Curse you!)
2015-03-29 14:45:09 +01:00
phil235
e2eda9cda8
Fixes growing rice stalk being invisible at later stages.
...
Fixes empty trays not receiving the nutrient/reagents/water you give it.
2015-03-29 15:15:49 +02: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
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
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
Swag McYolosteinen
bdfd2a2f7c
Merge pull request #8554 from RemieRichards/MonkeyHats
...
Monkeys can wear hats!
2015-03-28 13:47:35 +01: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
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
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
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
