042f62bdde
Merge pull request #8623 from sawu-tg/sawu-tg-patch-1
...
Fixes NPCPool stat runtime
2015-03-29 23:37:08 +01:00
1142cbd355
Fixes NPCPool stat runtime
2015-03-30 09:35:33 +11:00
bf36e8d040
Merge pull request #8615 from sawu-tg/npcpool
...
Updates the NPCPool to current branch.
2015-03-29 15:10:15 -05:00
8d87453501
Merge pull request #8542 from GunHog/ntsl_exSPANsion
...
NTSL Expansion!
2015-03-29 19:41:00 +02:00
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
66c47c98e1
Added check for inbuilt jetpack in movement_delay proc.
2015-03-29 16:15:13 +01:00
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
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
fdbef46277
Merge pull request #8543 from Szunti/mining-mobs-night-vision
...
Night vision for mining mobs
2015-03-30 01:22:53 +11:00
373516e522
Merge pull request #8579 from phil235/WelderInClosetFix
...
Fixes not being able to put unlit welding tool in open closets
2015-03-30 01:22:35 +11:00
8113c2a1f0
Merge pull request #8483 from xxalpha/c4fix
...
Fixes the C4 being planted on the DA.
2015-03-30 01:21:52 +11:00
c8e0c16d09
Merge pull request #8520 from MrPerson/effect_cleanup
...
Effect pooling
2015-03-30 01:21:40 +11:00
7619e4977e
Merge pull request #8536 from joonoro/poddoorfix
...
fix poddoors leaking gasses
2015-03-30 01:21:29 +11:00
eb5c73500a
Merge pull request #8524 from AnturK/bzzt
...
Adds Lightning Bolt spell
2015-03-30 01:21:19 +11:00
f5cf0dd3e9
Merge pull request #8392 from xxalpha/hardjet
...
Embedded Jetpacks
2015-03-30 01:21:05 +11:00
98873da060
Merge pull request #8549 from tedward1337/Ohgodthisishard
...
Adds Bluespace artillery button.
2015-03-30 01:20:45 +11:00
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
a127c9403a
Merge pull request #8553 from GunHog/Helmet_Fix
...
Fixes #8541
2015-03-28 23:35:19 +01:00
3dc6a83198
Fix-it-Phil
...
Fixes the broken spacebbits
2015-03-29 06:17:25 +11:00
eca852a8c1
Merge pull request #8569 from sawu-tg/easterevent
...
Easter is Out!
2015-03-28 19:32:49 +01:00
bdfd2a2f7c
Merge pull request #8554 from RemieRichards/MonkeyHats
...
Monkeys can wear hats!
2015-03-28 13:47:35 +01:00
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
55b81363cc
Merge remote-tracking branch 'upstream/master' into hardjet
...
Conflicts:
code/modules/clothing/spacesuits/hardsuit.dm
2015-03-27 19:35:10 +00:00
cb23548768
Merge pull request #8533 from Jordie0608/greatpermitsbringgreatweightresponsibility
...
Fixes #8527 , construction permit weight
2015-03-27 14:04:38 -05:00
8fba2cf22c
Merge pull request #8551 from MrPerson/surgery_fun_removal
...
Disallow doing surgery on yourself
2015-03-27 11:52:00 -07:00
17067d9021
Merge pull request #8508 from phil235/SlimeAnimal
...
Life refactor and slime as animal
2015-03-27 13:38:16 -05:00
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
ca38dfae9e
Fixes a wrong name. (Copypasta is bad)
2015-03-27 20:56:30 +11:00
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
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
d376456402
- Adds simple charging visual
...
- Adds sound effect
- Changelog
2015-03-26 22:53:41 +01:00
7b89713816
Fixes 8558
...
- Helmet crates now come with the proper helmet type.
2015-03-26 15:28:58 -05:00
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
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
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
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
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
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
a86b757d93
Merge pull request #8291 from Xhuis/nerf_thermal_vision
...
Nerfs changeling augmented eyesight
2015-03-26 13:01:25 +11:00
7a1232012b
Fixes more merge conflicts
2015-03-26 02:52:04 +01:00
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
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
31a808aa6d
Merge pull request #8509 from Iamgoofball/spin
...
Adds object spinning when thrown and *flip
2015-03-26 12:02:53 +11:00
e92fe6c333
Merge pull request #8495 from dannno/hahaobjectionxd
...
adds hammer and gavel
2015-03-25 16:13:39 -07:00
ce13faed09
Change select holiday names to #defines
2015-03-25 15:01:06 -07:00
da2108891a
NTSL Expansion
...
Enables NTSL to read and set four radio span classes to messages.
Also enables NTSL to set each of the say modification verbs to custom
values.
-Broadcast() proc of NTSL now accepts 5 additional parameters - spans
and each of the Say verbs.
2015-03-25 16:22:21 -05:00
6fef7fefea
- adds LoS obstacle check
...
- some sanity checks
- Removes the blowback, now the spell just fizzles harmlessly
2015-03-25 21:44:19 +01:00
0147d669f8
Added night vision to mining mobs.
2015-03-25 21:36:01 +01:00
2173b7b2db
Merge pull request #8485 from pudl/resprite
...
resprites the forensic scanner, cargo tagger, and the RPED
2015-03-25 14:56:51 -04:00
9d91a5935c
fix poddoors
2015-03-25 13:21:59 +02:00
Remie Richards
Sawu
Cheridan
Swag McYolosteinen
xxalpha
Jordie
phil235
phil235
hornygranny
Incoming
AnturK
GunHog
MrPerson
tedward1337
Szunti
WJohn
joonoro