Commit Graph

5297 Commits

Author SHA1 Message Date
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
Cael_Aislinn
7932f1f795 removed extraneous line in detectivework/evidence.dm, removed constructing closets from plasteel
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-22 17:56:57 +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
351e6d490c empty guns play a "click" sound
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-21 18:47:36 +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
0752ca2fff changed erroneous name in sec hardsuit, reverted some derpy chemistry merging
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-21 05:38:04 +10:00
Cael_Aislinn
20aa136a08 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-21 05:05:17 +10: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
d_h2005@yahoo.com
e2391d2eb8 -Gives nicer colors to reagents where needed. Mostly affects the fancier cocktails.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5586 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-20 04:23:13 +00:00
ericgfwong@hotmail.com
ef30d79392 Replaced medical hardsuits in EVA with security hardsuits. Sprite by Ausops (Modified to add a helmet light)
https://dl.dropbox.com/u/831776/sample.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5584 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-20 00:44:09 +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
d_h2005@yahoo.com
ec46676bac Fixes issue 1241 - Blood soup looks like tomato soup now instead of meatball soup. Removed the blood soup sprite.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5581 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-19 16:50:55 +00: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
aranclanos@hotmail.com
569378878d Runtime fix for trying to build invalid objects and circuits on the protolathe and circuit imprinter, respectively.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5576 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 19:17:08 +00:00
baloh.matevz@gmail.com
f873b86b35 - Small edit to the movement killswitch. The person who enables it will now be allowed to move, so he can try to detect any change to lag.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5572 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 03:12:43 +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
giacomand@gmail.com
e6d0ec4859 - Major optimisations to handle_reactions().
How is this an improvement? Before we looped through every possible reaction to see if a reaction would occure with our list of reagents. Now we already make a list of reagents which can have a reactions, cutting down on searching every single time. This will decrease the loop expensive iterations from 100s to only a handful.

How does it work? We format our chemical_reactions_list like this:

chemical_reactions_list[reagent_id] = list()

And then we fill that list of possible reactions. Thanks to Exadv1, to cut down on redundancy we only need to have a reaction in a single list at a single time, because our handle_reaction() loop will handle that.

Here is a paste of the structure of the list on runtime. http://privatepaste.com/327bb61628

(has: = an entry in the list that it is nested in)

 - Fixed mecha weapons shooting over people lying down.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5569 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-17 20:34:47 +00:00
giacomand@gmail.com
71ba8dfcd2 - Fixed design IDs not being unique. They should be constructable now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5568 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-17 14:07:03 +00:00
johnsonmt88@gmail.com
1f07f31b64 Grammar fixes for item-suicides.
I got about half-way through changing these when SuperSayu came up and said he fixed this a while ago but never posted the fix. So technically half of these were fixed by me and half by him. Credit to both of us!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5564 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-17 02:52:57 +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
Cael Aislinn
c32f1ac100 Merge pull request #2192 from CIB/BEF-premerge
Metabolism fix
2013-01-16 00:25:18 -08:00
giacomand@gmail.com
dfc282c9ef - Did some very minor optimizations to get_mobs_in_radio_ranges() and set the proc as a background proc.
- To help further lower the cost of this proc I have lowered the default intercom range to 2. I then added consistency of not being able to use an intercom from across the room by adding a check for distance, using the same variable as the intercom range. 
 - Committing a fix by VistaPOWA for the changeling sting drink. You should be able to create it now by mixing screwdrivercocktail, limejuice and lemonjuice.
Before it was orangejuice, limejuice, lemonuice and vodka but orangejuice and vodka would mix first to create screwdrivercocktail.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5560 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-16 07:38:35 +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
e181b90ca2 Bugfix: Fix metabolism rates for foods, drinks and sleep toxins. 2013-01-16 02:55:23 +01:00
MrYeti
7ba4df4462 Added Purple Gloves 2013-01-15 17:44:23 -05:00
Mloc
cad798adad Merge pull request #2187 from CIB/BEF-premerge
Merge pre-tg-merge BEF
2013-01-15 13:29:59 -08: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
CIB123
eeacf01186 Made overall reagent effects balance out with REAGENTS_METABOLISM
This is a BS12 compatability change, with the intent of making it easier to change the rate at which chemicals are metabolized. This doesn't actually change anything about the effect of chemicals, until REAGENT_METABOLISM is adjusted, at which point the effect of a lot of chemicals will automatically adjust accordingly.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5556 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-15 16:10:45 +00: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
Cael_Aislinn
70764ac039 tweaked some supply packs a bit, added formalwear and pizza supply packs, made supply packs organised and selectable by type in the order menu
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-15 23:20:00 +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
5bb06b184c - Added a killswitch to the master controller for air processing and pipe processing, accessible through two toggle-verbs in debug verbs.
- Added a verb that breaks all airgroups into individually processing tiles and a verb that forces a group-rejoin attempt on all airgroups. Once the verb to break all air groups is used, they will not attempt to recreate until the recreate verb is used. In other words, this is for debugging, not goofing around. Verbs available in debug verbs.
- Some atmos code standardization
- Decreased the pressure resistance of most items by a factor of 10, meaning pressure will finally actually move items around!

I also attempted to speed up air movement, but it caused runtimes and everything moved in checkered patterns and I got scared so I didn't include it in this commit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5554 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-15 07:12:32 +00: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