Commit Graph

2698 Commits

Author SHA1 Message Date
Chinsky
7a66e7e524 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
2013-01-22 23:46:42 +04:00
Chinsky
79b17d0c1d Furry delight, more facial hairs and hairstyles for space cats.
Sprites provided by Mister_Fox
2013-01-22 21:52:40 +04:00
Cael_Aislinn
7d0fb3d51a compile / dme fixes, removed unused file
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-23 01:11:19 +10:00
Cael_Aislinn
7f05c6fdb3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-23 01:02:27 +10:00
Jim "Apples"
090495f386 Merge pull request #2205 from caelaislinn/bleeding-edge-freeze
Miscellaneous (see desc)
2013-01-22 06:55:44 -08:00
Cael_Aislinn
104bc8dd98 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/datums/supplypacks.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-23 00:48:07 +10:00
Cael_Aislinn
fb2b2a1d52 various compile fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-23 00:43:54 +10:00
Cael_Aislinn
bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-23 00:23:37 +10:00
johnsonmt88@gmail.com
005acb5529 Runtime fix for:
runtime error: Cannot read null.name
proc name: New (/obj/effect/golemrune/New)

The reaction that creates the rune was creating the rune in nullspace, it tried to use the loc in it's constructor, then it set the loc afterwards. Now it runs the constructor and such, THEN runs 'announce_to_ghosts()' after it is assigned a loc.

I've also changed src.loc.name to get_area(src) so instead of "A golem rune was created in area Floor " it says "A golem rune was created in Chemistry."

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5597 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-22 02:54:16 +00:00
johnsonmt88@gmail.com
3ac21339c1 You can now make a single camera use multiple networks.
var/network = string is now var/list/network = list().
I've also added a "network_multi" var which is a string. This is specifically for placing cameras on a map that you want to put on multiple networks. Apparently DM's map maker doesn't support lists, so just type them all in as a string and camera/initialize() will take care of the rest.
Input the networks with commas seperating them, for example: "SS13,RD,Secret,Prison,Ect"

I fixed a few issues while editing the cameras on the map as well.

Both maps:
- Re-added the telescreen in the misc research room that got removed at some point. (Thanks to Ikarrus for pointing this out)
- Any room that had 2 cameras (one for each network) were merged into one camera with the new network lists.
- - Permabrig-hallway (SS13, Prison)
- - Every room in R&D (including robotics) (SS13, RD)
- - The bomb testing range (RD, Toxins)

tgstation.2.1.1.dmm:
- Added a missing wire in engineering-sec (Thanks to SuperSayu for pointing this out)
- Fixed some mis-orientated firelocks. (Thanks to Intigracy for pointing this out)
- - The mining door between cargo and mining
- - The door between the hallway and the engineering lobby

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5596 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-22 01:24:09 +00:00
Cael_Aislinn
bb4be2c86a moved cryo cells to the same layer as tables - this will look weird for stuff on the top tile ('behind' the cry cell) but beakers wont be hidden underneath it when they're ejected any more, fixed typo in escape shuttle, fixed syntax error in new player setup screen
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-21 19:25:19 +10:00
Cael_Aislinn
632cad1044 observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-21 18:47:03 +10:00
d_h2005@yahoo.com
e15c63d100 -New chicken sprites! Other minor tweaks to chicken code, slows them down some and notches the lay rate back a bit.
-Fixes invisible cane inhands.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5595 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-21 06:02:30 +00:00
d_h2005@yahoo.com
c8a15aef72 Chickens will now lay a certain number of eggs per wheat fed to them. This changes the process from a passive one that happened regardless of user input to an active one that requires conscious effort. Bkaw.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5589 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-20 20:49:02 +00:00
Cael_Aislinn
3e6283403f cleanup of alt titles handling, made sechuds able to see icons for the real job if players have an alt title, made custom job titles via id computer into alt titles
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-21 04:55:02 +10:00
Cael Aislinn
901741aa70 Merge pull request #2203 from comma/master
Map update and pose system
2013-01-20 08:53:00 -08:00
Kortgstation@gmail.com
b0077b3498 Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up.
They also added extra checks to

-Everytime a mob attacked (checking for super strength and electric hands)
-Every time a mob was attacked (checking for dermal armour)
-Every time a human was shot (checking for reflex)
-Every time a human breathed (checking for rebreather)
-Every tick of human life (checking for regen)
-Every hud update (checking for radar)

Not to mention just cluttered mob code in general. I know there won't be any noticeable performance increase from this but seeing as they were never going to be finished (I asked Doohl beforehand) and mob code is messy enough as is, I think only good can come of removing the code.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5587 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-20 10:45:20 +00:00
entrian.tration@gmail.com
7516e0698b Issue 1231 resolved with http://forums.nanotrasen.com/viewtopic.php?f=16&t=11769
Armor now appropriately reduces damage taken from explosives.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5582 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-19 21:15:11 +00:00
Chinsky
f04185024a Moved pose text lower per suggestions on forums. 2013-01-19 22:53:44 +04:00
Chinsky
03321fa04d Used BYOND macro instead. 2013-01-19 12:42:06 +04:00
Chinsky
fa7f2327ce Added Set Pose verb.
Sort of passive emote, which is seen when mob is examined.
2013-01-19 11:26:54 +04:00
giacomand@gmail.com
95392cae87 - Fixed retaliating simple animals acting weird and added some minor improvements. They should act better to mechs.
- Decreased the amount of possible chickens you can get from the crate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5577 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 19:54:00 +00:00
baloh.matevz@gmail.com
3d0d03a74f - Added killswitches to say, whisper, me, ooc, adminhelp and pray to try to determine if communication verbs are the cause of the constant lag we're getting. Toggle the killswitch with the 'disable communication verbs' verb, available in debug verbs.
- Added killswitches to all Enter() and Entered() procs to try to determine if movement is the source of all the constant lag we're having. Toggle the killswitch with the 'disable all movement' verb, available in debug verbs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5571 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 03:04:46 +00:00
Cael Aislinn
a5c1cf781a Merge pull request #2185 from CIB/feature
Autopsy scanner fixes
2013-01-16 17:57:35 -08:00
Cael Aislinn
f472e07cc1 Merge pull request #2194 from comma/master
Surgeray
2013-01-16 17:57:05 -08:00
Kortgstation@gmail.com
4f95636530 Slimes can no longer be buckled to things, they're too squishy (people were abusing the fact that slime AI can't unbuckle)
Golems get head protection from their suit now and have their head slot clear so you can tell em apart with hats.

Fixed a typo related to slime surgery that I assume has been around since metroids were added how did nobody notice this thanks Failcakes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5563 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-17 00:59:18 +00:00
Kortgstation@gmail.com
5ec728f26a Added an attack_slime for simple animals so slimes can hurt them.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5559 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-16 07:11:51 +00:00
Kortgstation@gmail.com
3d076264bd Made golems a bit faster so they're not so godawful to play.
Made the adamantine core create a golem creation rune (and sends a notice to all ghosts that a rune has been created in whatever location)

The rune lights up when a ghost is hovering over it.

When someone clicks the rune, it'll pull a ghost hovering over it to make the golem instead of a random one.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5558 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-16 04:17:45 +00:00
cib
cdda38b6be More fixes for issue #2153
High/low body temperature damage now leaves an autopsy message.
2013-01-15 21:23:03 +01:00
cib
4773361f64 Proper fix for the projectile runtime.
Adds projectile autopsy messages back. Partial fix to issue #2153
2013-01-15 19:46:30 +01:00
Cael_Aislinn
e423798b8d removed a bunch of unused files, moved amorphs and meme to workinprogress/cib
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-15 23:29:49 +10:00
Chinsky
0f561b141c Merge branch 'surgery' 2013-01-15 14:30:01 +04:00
Chinsky
6d830af37c Merge branch 'master' into surgery
Conflicts:
	code/WorkInProgress/surgery.dm
	code/modules/mob/living/carbon/carbon_defines.dm
2013-01-15 13:42:13 +04:00
baloh.matevz@gmail.com
4b5b5ea87e - Added a config option that requires players to have played a certain number of days to select some jobs to play. The option is turned off by default and requires the database to work. See screenshot for default age requirement.
- When players connect, the database is polled for their age, accounts matching their ip and computer id. This information is stored in their client datum.

Screenshot: http://www.ss13.eu/account%20age%20restriction2.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5552 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-15 03:39:46 +00:00
Kortgstation@gmail.com
df0396ecf6 Added a config option to allow ghosts to spin chairs. ilu /vg/
Changed slime attack message from bit/slash to "glomp"

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5551 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-15 03:04:34 +00:00
johnsonmt88@gmail.com
e5750c9f6b Alien-speak and silicon binary-chat should now work properly using # or . instead of :
Fixes issue 1243.

Committing for Startoad:
The janitor supply crate (from cargo) now comes with a trashbag inside.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5550 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-14 23:31: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
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
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
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
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
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
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
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
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