Commit Graph

8886 Commits

Author SHA1 Message Date
petethegoat@gmail.com
4e022a9b45 Recoded the spellbook. Should fix the bug which stopped the staff of animation spawning, and prevent similar bugs in the future.
Moved the spellbook define into spellbook.dm, in the wizard gamemode folder.

Moved the old spells.dm to unused.

Added some new guns to summon guns.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5549 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-14 20:17:04 +00:00
giacomand@gmail.com
f6078aba78 - Bugfix for user created areas not correctly powering machinery.
- Fix for retaliating hostile mobs to not attack itself.
- Grammar fix for goats and cows.
- Fix for malfunction and continuous rounds; which doesn't stop the count down timer when the AI dies.
- Spiderlings won't grow inside vents and spiderlings are much easier to kill, can be shot with a projectile and display a message after dying.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5548 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-14 17:46:33 +00:00
Cael_Aislinn
e4db320f97 removed unused files, moved simple_animal/head
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-15 00:00:15 +10:00
GauHelldragon
b093f04310 Feature: Bang kitchen trays with rolling pin just like riot shield + baton
The public demands it!!
2013-01-14 05:49:39 -08:00
Cael_Aislinn
20cacd30de sanitize renaming id cards via computer and agent cards
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 23:44:16 +10:00
Cael_Aislinn
d532ec9712 add+fix missing files for jungle away mission, re-add missing atmos and security rigs, refactor and cleanup rigs
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 23:29:53 +10:00
Cael_Aislinn
8581932c57 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/objects/items/toys.dm
	icons/mob/back.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/weapons.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 22:14:46 +10:00
Cael_Aislinn
09a9c7458f runtime fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 21:46:12 +10:00
Cael_Aislinn
cf6aadef09 remove some unused files, tick barsigns.dm and removed duplicate definition
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 21:23:47 +10:00
Cael_Aislinn
1c9b04ec74 copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 21:07:16 +10:00
GauHelldragon
77d22749f1 Hydroponics trays will update icons after being weeded now. 2013-01-13 17:30:27 -08:00
ericgfwong@hotmail.com
b6762f4382 Added map 2.1.1, which runs department security.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5544 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-14 00:50:14 +00:00
petethegoat@gmail.com
adae991ef5 Alien runtimes fixes from Cael.
Added a new syndicate bundle option, the smooth operator. Includes a pistol, silencer, clean up gear, and the ever essential suit and new formal shoes, with sprites by Flashkirby.
Currently the shoes are only used by smooth operators, but I'm gonna ask Ikarrus to put some on the latest map when he's done with it.

Changed the 9mm casing to use midbullet2, as weakbullet is just pathetic.

Removed /obj/item/weapon/glass, on account of it being awful and unused.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5543 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-13 22:08:16 +00:00
Jim "Apples"
c8032311b5 Merge pull request #2162 from comma/master
EMP x Implants OTP... and lots of other things.
2013-01-13 04:29:50 -08:00
baloh.matevz@gmail.com
13915bad63 - Additional updates to brewing code. Added two more machines: Squeezer, which will destroy the food items stuffed into it, but return some of the food item's reagents (not coded yet, need to go through all reagents to see which are applicable); and a centrifuge, which removes common catalyst reagents from food items (currently just enzymes)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5541 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-13 09:34:33 +00:00
d_h2005@yahoo.com
788b2576cd -New sprites for spider cocoons and webs.
-Adds green-striped medbay deptsec armbands, at the behest of ikarrus

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5540 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-13 09:09:50 +00:00
Chinsky
7f84b415a8 Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps. 2013-01-13 11:56:33 +04:00
Chinsky
c0fc8f965b Added doublecheck for disfigurement 2013-01-13 11:52:41 +04:00
baloh.matevz@gmail.com
ced6a017b0 - Added a basic destilery module. It currently includes three machines: A mill, a fermentary and a still. There is currently only one 'demonstration' recipe, which is:
- - Use mill to turn wheat into flour
- - Use flour in fermentary (along with water - you need to varedit water_level right now) - Also I know flour is not what you use to ferment. It's just a demonstration. - Produces beer.
- - Use beer in still to make vodka. Same as with the fermentary, it is just for demonstration.

These things are not yet available on the map. They will however be available to botanists and/or the chef. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5539 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-13 07:35:22 +00:00
giacomand@gmail.com
d9c3a3fd4c - Spiders are slower and take more damage from cold/heat.
- Increased the announce time for infestations.
- Made the staff of animation mimics not care about staffs being dropped, they will not attack their creator ever.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5538 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-13 04:16:31 +00:00
baloh.matevz@gmail.com
4db6928fb3 - forgot to commit biomass.dm. Sorry about that.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5537 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 23:28:05 +00:00
baloh.matevz@gmail.com
e5bb5e5385 - Goats are now really good against space vines.
Video: http://www.youtube.com/watch?v=ppWHr9iwdZI

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5536 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 23:24:40 +00:00
giacomand@gmail.com
458fddbea5 - Tweaks to spiders to be less robust.
- Made goats/cows not give infinite milk but instead slowly generate milk in their udder for collecting.
- Lowered speak chance for chickens and added a limit for how many chickens can be bred.
- Lowered the chances of an egg to be a chicken hatching egg.
- If you put an egg in your pocket it won't be a chicken hatching egg anymore.
- Chickens won't spawn inside you anymore.
- Added some abstract classes to the list of things that shouldn't spawn with slime cores.
- Increased the time between events.
- Added a spawn spiders button for admins.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5535 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 23:07:51 +00:00
petethegoat@gmail.com
b7f29ca03e Committing a new wizard spell, by S0ldi3rKr4s0, and a fix for jetpack mining borgs not having their eye overlays, also by him.
In totally unrelated news, added a horse mask.
Improved say.dm, so that adding more mask voicechanging snowflake code shouldn't have quite such a big impact.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5534 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 22:52:49 +00:00
baloh.matevz@gmail.com
227d561acc - Made biomass a viable thing to spawn. It spreads and grows exactly the same as space vines (kudzu), but unlike kudzu, which is opaque, but not dense, biomass is dense, but not opaque.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5533 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 22:27:21 +00:00
Chinsky
3447c61e49 Moved surgery from WIP to modules, since it's not really that WIP anymore.
Split one huge file into several smaller ones for readability.
2013-01-13 02:11:06 +04:00
Kortgstation@gmail.com
633b09915a Adult slimes can now vent crawl.
Golems get a built in helmet.

Slimes pass on universal speak when they evolve/reproduce.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5532 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 20:31:28 +00:00
Chinsky
f22749df04 Merge branch 'adminstuff'
Conflicts:
	code/modules/admin/admin_verbs.dm
2013-01-12 23:48:03 +04:00
petethegoat@gmail.com
756ddd3b05 Reverting some alien infestation checks that meant that no aliens would spawn if the event wanted two aliens, but there was only one candidate.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5531 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 19:25:35 +00:00
Chinsky
b7d5c872a3 Merge branch 'ohgodsilly' 2013-01-12 22:50:54 +04:00
Chinsky
18a5554da5 Merge branch 'secfashion' 2013-01-12 22:50:22 +04:00
Chinsky
08160b5111 Added alternative security uniforms to wardrobes.
Security armor vest now has different sprite.
2013-01-12 22:48:18 +04:00
Chinsky
dc2f77ddd0 Merge branch 'cult' 2013-01-12 22:30:56 +04:00
Chinsky
2f70033ac0 Merge branch 'job' 2013-01-12 22:30:01 +04:00
petethegoat@gmail.com
8d773e827c Made the alien infestation event only create a command report if it successfully spawns an alien.
Slightly improved comms blackout code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5530 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 18:05:41 +00:00
giacomand@gmail.com
b4d15e55e1 -Added a check for anchored items for spiders to caccoon.
-Removed some copy and pasted code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5529 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 17:56:12 +00:00
giacomand@gmail.com
adfe165840 -Forgot the spider infestation file.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5528 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 17:40:43 +00:00
petethegoat@gmail.com
4fdfce5b69 Updated the comms blackout event, re-adding the chance for it to create a command report with Giacom's permission.
It now picks from a list of alerts with varying levels of fuckedup-ness, to try and better communicate the idea of unreliability when the crew do hear it.

Increased the time between events.

Updated cows so it's disarm intent to tip them over, and made chicks not offset off their turf.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5527 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 17:32:04 +00:00
giacomand@gmail.com
3151418610 -Forgotten to remove a file.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5526 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 16:45:45 +00:00
giacomand@gmail.com
a56e922053 Committing for Cael_Aislinn:
= Giant Spiders =
- Nurses spin webs which impede progress, bundle items and mobs up in cocoons, lay eggs to create spiderlings
- Nurses are slow and weak, but their bite has a chance to paralyse the victim
- Spiderlings skitter about and eventually grow into giant spiders. 
- Spiderlings will ventcrawl, so they can spread over the station pretty fast. 
- Hunters are fast, have decent health and the most effective poison
- Guards are medium speed but the health and direct damage
- The poison of hunters and guards can cause hallucinations if they bite you

= Farm animals =
- Cows can be milked or butchered for a large supply of meat. Sadists can also tip them over (with intent_help). 
- Goats can also be milked, but have a nasty temperament. 
- Chicks grow up to be chickens, who lay eggs and continue the cycle. But where did it start? (they're very noisy). 
- All three are orderable via QM. 

My changes:

- Added a spider infestation event.
- Optimized code with spiders and simple_animals.
- Made a /hostile/retaliate type which will only fight back when hurt. Based on Cael's code.
- Added some farm animals on the map.
- Changed events, added a setup() proc which can let you setup variables or the event. Made the event only kill itself when it has called, announce(), start() and end().
- Brainrot will only need alkysine as a cure.
- Communication blackout will always be silent.
- Changed some admin buttons to use the new event system.
- Added a forceEvent proc which you can use when you enable debug verbs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5525 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 16:44:06 +00:00
petethegoat@gmail.com
616fcf1e88 Removing a needless line in /mob/living/proc/apply_damage().
<carnie_> basically it's updating overlays every tick in space...even if nothing changes
<carnie_> and updating overlays even when you're changing something like halloss

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5524 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 14:16:51 +00:00
Chinsky
8a3758af72 Morgue trays now can open in different direction depending on how they are placed.
No way to rotate ingame though, mapping and badminning only.
2013-01-12 09:32:08 +04:00
Kortgstation@gmail.com
c398bcb344 Remapped the permabrig. I think it could still be better (and will try to work on it more and welcome others to do so) but I also think it's better than what we have now and don't want to wait forever and let my map get out of date.
http://i.imgur.com/IGhrG.png

Harm batons no longer stun unless the baton has charge.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5523 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 00:40:18 +00:00
giacomand@gmail.com
5cbb7b4111 -The shuttle will not stop creating holes when it is on fire.
-Aliens will be able to recover plasma even when they have cloneloss damage. Previously, if they did have any amount of cloneloss damage they wouldn't be able to regain plasma at all.
-Runtime fixes for IDs.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5522 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 23:54:24 +00:00
aranclanos@hotmail.com
db1cd83bc1 Runtime fix for borgs touching buttons on their UI about items that were deleted. This is just a small fix and somewhat incomplete, I'm not on the mood to fix the whole borg interface.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5521 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 20:26:48 +00:00
petethegoat@gmail.com
4d9d0efdcd Increased the announceWhen for the brand intelligence event.
Made infected vending machines flip their speech switch back to on.
Added a new line for the origin machine, from Rockdtben.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5520 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 18:46:24 +00:00
aranclanos@hotmail.com
da44fa7472 Runtime fix for mech sleepers feedback messages at injecting the victim with the last units of a reagent.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5519 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 18:44:17 +00:00
petethegoat@gmail.com
ab4ecf3373 Committing a new event, rampant brand intelligence. Thanks Callans for the idea.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5518 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 18:34:51 +00:00
baloh.matevz@gmail.com
fa84ba9611 - Added a small bit to the SQL statement so I can update the database structure later on, without it breaking the ban system until it updates.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5517 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 13:54:11 +00:00
giacomand@gmail.com
13b25d24cf -Breathing plasma will now give you the plasma reagent for toxic damage which will need treatment, in order to remove it from your body quickly. This creates a nice poison effect.
-Made the plasma reagent damage you more.
-Syndicate agent cards will now work inside pdas/wallets.
-Switched some comments around in event.dm
-There was a bug with a local variable list which became null, the problem was that there is no where in the code which could've nulled it. My only theory is that not having . = list() first maybe caused problems, but it seems unlikely. I changed it anyway and I'll keep watch for it re-appearing.
-Fixed a bug with the new firedoors not keeping out heat, since they have an opacity of 0. I switched everything around to accommodate this.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5516 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 13:53:48 +00:00