Commit Graph

2196 Commits

Author SHA1 Message Date
Cael_Aislinn
6d4e17ac32 fix for alien species limiter bug
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-12 23:36:10 +10:00
Cael_Aislinn
419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-12 17:53:17 +10:00
Cael_Aislinn
33e12ca9d3 readded speech bubbles, tested on humans only. also pre-emptively fixed (?) a bug with alien languages
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-12 17:43:21 +10:00
Cael_Aislinn
79ad144e91 fix^2 for mods and admins not being applied correctly, along with the admin/player panel not showing up
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-12 16:39:26 +10:00
Cael_Aislinn
fed6625e07 fix for moderators not being loaded correctly
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-12 13:44:23 +10:00
giacomand@gmail.com
5a93673762 -Larva grow a little faster (an extra growth per life) when on weeds or when breathing in plasma.
-Observer following is cancelled when there's no client.
-Made facehuggers/eggs a little smarter. They won't try to go after people with masks covering their mouths (as that kills them), however when they're thrown they will still try to attach to the person.
-Improved alien stats(). You'll be able to see the max plasma and larva will see the escape shuttle.
-Blessing with a fire extinguisher wasn't working because of the volume check. Removed the check.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4842 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-10 19:56:51 +00:00
Kortgstation@gmail.com
67433021a1 Combined the PDA constructor things. My bad.
Replaced all the for mob in range show in Syndicate.dm etc with visible_message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4840 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 19:42:57 +00:00
Kortgstation@gmail.com
18608f3ca6 Added Syndicate NPCs/sprites for them. They come in a few varieties, some with shields and swords, some with guns(yes they shoot). They're simple animals, but they drop a corpse landmark when they die, so you can loot them normally.
A plea to admins: Dont fucking spawn these everywhere, they're meant to be used as badguys in away missions, not for you to fuck up every round by spawning 70 of them.

Clowns also drop a real (lootable) body on death.

Added new corpse types. Syndicates as well as several civillian jobs.

Added a new area/copied a shuttle icon over into floors as part of work on my map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4839 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 19:22:14 +00:00
Cael_Aislinn
773732c609 fix for admins not being applied successfully on round startup, added some resource caching i forgot about before
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 23:54:31 +10:00
Cael_Aislinn
6365459bde additional mergefixes, including tg map updates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 23:22:51 +10:00
Cael_Aislinn
c6916f678d updated changelog, added new TG notif type to show tg ports
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 23:15:28 +10:00
Cael_Aislinn
cccff0881f Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 23:07:41 +10:00
Cael_Aislinn
825a7dcbf9 various mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 22:49:38 +10:00
giacomand@gmail.com
029429ecc2 -Commiting Aran's fix to human examination. Including dead people not showing up as ghosted.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4838 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 08:09:34 +00:00
giacomand@gmail.com
7d6fb8fd6a Commiting for Aranclanos.
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10189&p=143580&hilit=https%3A%2F%2Fwww.dropbox.com%2Fs%2Fcwflgm7793ts20s%2FBorgsForCasualsRELOADED.patch#p143580

-Fixed some ugly text in Ion laws "THE STATION IS [0x6006265] FETISHES...LAWS UPDATED".
-Fixed some typos on the Ion laws.
-When borgs are emagged, now they show their laws for themselves.
-When new laws are uploaded, the borg gets instantly the new laws, just like the AI, instead of the confusing message "Your AI has set your 'laws waiting' flag.". Remember this is a patch for casuals.
-The borgs gets the same message than the AI in Ion storms.
-Made the admin Ion storm show the "...LAWS UPDATED" text.
-Borgs get a different law 0 telling them to help their master.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4837 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 05:37:28 +00:00
giacomand@gmail.com
8c2036635e -Making AIs traitors will actually give them a law 0.
-Removed a feature so it cannot be exploited and clear your laws.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4836 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 04:05:51 +00:00
johnsonmt88@gmail.com
a1dcd3ed52 Apparently I was using emote() incorrectly in parrot stuff. That should now be fixed. Thanks Giacom for pointing this out.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4834 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-08 13:35:31 +00:00
johnsonmt88@gmail.com
86fe18f32f More work on parrots!
- Parrots now have a chance to use department channels when they speak, assuming they have a headset with encryption keys. Parrots can not use the common channel ';'. I seems to be more trouble than it's worth to set up and it would get annoying very fast.

- The drop_item proc now works properly for player-controlled parrots

- A parrot's sprite now updates when they get pulled

- Fixed a bug where a player attacking a parrot would get messages intended for the parrot

- Player-controlled parrot sprites now update when they move

- Player-controlled parrots can now perch themselves on perch-able objects.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4831 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-08 02:36:24 +00:00
sieve32@gmail.com
396fb3b411 Commiting for Aranclanos
-Fix for blindfolds not protecting from flashes
Fixes Issue 934
-Being handcuffed drops held items
Fixes Issue 975
-Can no longer abuse the holodeck to deconvert revs
Fixes Issue 968

Tested everything myself and it all works

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4829 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-07 22:18:29 +00:00
baloh.matevz
2bf2f7bef8 - Updated ingame polling to allow for polls that ask for player-entered text. This allows for more complex answers than a pick from a list.
- Added simple bump teleporters.
- Updated 3.0.0 some more, including the draft of a new Centcom.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4826 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-07 21:08:23 +00:00
sieve32@gmail.com
8b5aaeb3b9 -Added AdjustX()'s to simple_animal/life() so they won't be stunned 5ever
Fixes Issue 982

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4825 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-07 19:54:50 +00:00
johnsonmt88@gmail.com
4979a98e77 Fixed a typo when trying to latejoin before a round starts or after it finishes.
- A '/' should have been a '\'

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4824 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-07 18:42:51 +00:00
quartz235@gmail.com
44b5a92c5d Skeletons can now play their ribcages like xylophones! FUCKING SPOOKY!
- Must not be wearing a suit or uniform, done by clicking on self with help intent
- Removed a leftover debug message

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4820 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-06 17:39:22 +00:00
johnsonmt88@gmail.com
a3b99bccfa Reverts "world.time -> world.timeofday" in mob movement code. Hopefully this stops people freezing at midnight GMT.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4818 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-06 13:24:34 +00:00
d_h2005@yahoo.com
b0c1d91a6f Fixes issue 954.
Fixes issue 952. 
Fixes issue 951. 
Fixes issue 949. 
Fixes issue 946. 
Fixes issue 944.

Committing Aranclano's bevy of bugfixes. All credit/shrieks-of-fury to him.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4815 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-05 21:17:04 +00:00
giacomand@gmail.com
31655a8f56 -Ghosted queens don't count towards drones not being able to evolve.
-Changed facehuggers slightly. They eventually go active again.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4814 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-05 16:52:32 +00:00
Cael_Aislinn
6bd0e536bd Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/datums/organs/organ_external.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/recharger.dm
	code/game/objects/hud.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/mob/living/carbon/alien/humanoid/hud.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/hud.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_helpers.dm
	code/modules/mob/mob_movement.dm
	code/modules/mob/screen.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/power/cable_heavyduty.dm
	code/modules/projectiles/guns/energy/temperature.dm
	code/setup.dm
	config/game_options.txt
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
	icons/mob/screen1_alien.dmi
	icons/mob/screen1_old.dmi
	icons/obj/atmospherics/passive_gate.dmi
	icons/obj/pipe-item.dmi
	interface/interface.dm
2012-10-05 22:21:26 +10:00
sieve32@gmail.com
758b7160dc Gah, missed a </span> and some bad indentation, sorry about that.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4812 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-05 05:48:30 +00:00
giacomand@gmail.com
2e3d42dfb1 Changed aliens considerably.
-Aliens now take damage when they are in a hot environment.
-Aliens now take more damage from fire damage. ( * 1.5 the amount)
-Alien facehuggers are always active and they'll latch onto people who walk by them, and not just walk on them. Commented out "activate facehuggers".
-Eggs will now open to nearby possible hosts. If they're still nearby, the facehugger will latch onto them. New icons by WJohnston.
-Aliens will now see the shuttle ETA.
-Drones can't evolve into queens/princesses if there's already an alive queen.
-Made queen heal a little bit faster (5 to 10). The queen was regenerating at the same rate as her underlings, and the queen is much more important now.
-Moved some copy+pasted stuff into the "mob/living/carbon/alien" class, so larva and humanoids shared stuff.
-Disarming a cyborg stuns them a little longer.


Added a piece of paper on the DJ station that helps people setup the telecommunication machines there and listen onto private frequencies.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4810 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-05 04:36:24 +00:00
sieve32@gmail.com
8c387f2158 -Made all contructs children of /mob/living/simple_animal/construct and changed the type paths as needed
-Now when examining someone you can tell if their brain is missing, and it doesn't give the 'catatonic' part (Because the player is in a different mob and it's kind of misleading)
-Committed Lugar223's patch for the temperature gun, preventing the window from re-opening as it heats up/cools down
Fixes Issue 900
-Fixed the issue where dead players could use pAI carts if they left the window open
Fixes Issue 967
-Changed how the Destructive Analyzer handles sheets, now it will only deconstruct 1 sheet out of the stack at a time. Also found a bug where it would destroy its own components, so that is fixed as well.
Fixes Issue 989
-Secborgs can no longer put their stun baton or energy gun in rechargers, added a check for /mob/living/silicon
Fixes Issue 972

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4807 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-04 22:08:27 +00:00
giacomand@gmail.com
fd1df4d881 -Fixed a bug where you can get to CentComm with the wormhole generator.
-Fixed changeling runtimes.
-Fixed chunk runtimes.
-Fixed reagent grinder runtimes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4802 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-03 01:35:29 +00:00
polyxenitopalidou@gmail.com
9f020e76e7 •Added skeletons
•Only usable through the admins' view_variables as of now, since no actually good ways of implementing them came up
•makeSkeleton() is still there, ready to be used wherever you wish.
•Note: Skeletons have no underwear and no eyes.
•Rewrote some minor stupid shit

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4800 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 22:29:13 +00:00
baloh.matevz
1be33c6522 - Fixes issue 984. Clicking the internals button will now attempt to equip your internals even when you are buckled. It will not succeed if you are buckled and restrained tho, not that you could hold anything in that state...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4797 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 21:50:33 +00:00
baloh.matevz
0a97ae6570 - Changed the brute and fire damage overlays to the ones shown in this thread: http://nanotrasen.com/phpBB3/viewtopic.php?f=15&t=9927&start=150#p145089
- Added a white overlay which fills up while you are in critical condition. It represents how close you are to death. Basically it's a health indicator from 0 to -100.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4795 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 15:13:32 +00:00
rockdtben@gmail.com
a39705d4d4 The RCD code is less ugly now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4793 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 00:35:00 +00:00
giacomand@gmail.com
8e776b0df0 Added a new word, for people with the retard disability, to say.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4788 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 20:40:41 +00:00
elly1989@rocketmail.com
00921387e7 Added mob-examine code for ties
Added medals as a type of tie. Awaiting sprites. Need a bronze, silver and gold on-mob sprite. And icons for the items themselves. Don't bother with in-hands

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4783 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 17:42:11 +00:00
giacomand@gmail.com
e064bd15bd -Tweaks to purchasing free changeling powers when making a changeling.
-Add an "if(usr != src) return" check in the AI's topic.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4778 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 13:53:49 +00:00
elly1989@rocketmail.com
6909f8dd91 removed src arguments from new /obj/screen(src) as src was a datum anyway. This is to remove confusion.
When hud_used is deleted, references to those objects are removed, hence they are garbage collected.
Removed some code from metroids which could possible delete global_hud objects which would cause problems.

Added a verb to code/WorkInProgress/carn/debug_locnull.dm which prints all atoms with loc==null to world.log

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4774 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 11:35:24 +00:00
elly1989@rocketmail.com
14c5bcf325 Removed a lot of commented out code from hud. Removed some unused variables.
Trying to move everything into datum/hud, doing this will allow huds to be made more modular. Meaning more mobs can have huds with smaller and maintainable code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4773 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 08:48:19 +00:00
elly1989@rocketmail.com
eb10f04ea3 obj/hud is now datum/hud. There was no need for it to be an object.
Moved some of the static overlays such as the dither effects, druggy effect and blurry-eyes into datum/global_hud. Meaning that only one object is instanced per server rather than per mob. It reduces on code.
Commented out a green and red overlay which aren't used, which were being instanced for every mob.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4767 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 23:02:11 +00:00
elly1989@rocketmail.com
b903680fbd Changed client/verb/a_intent_change() to mob/verb/a_intent_change()
Replaced usr references with mob
This means it can be called as a proc for any mob to use that code. Updated the click-procs to use this as they were using slightly different code.
Fixed an issue with AIs using the intent hotkeys
Added more sanity checks to it.
Insert key uses the same code as other hotkeys.
Commented out some unused hud-code from when we had separate intent buttons.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4766 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 06:45:57 +00:00
elly1989@rocketmail.com
01882fec26 Resolves issue 961 - invisibility is set in the define not in New for ghosts
Replaces usr with mob. Using usr means invisimin can't be used as a proc


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4765 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 03:56:51 +00:00
quartz235@gmail.com
a6e7c085ef Revert's cib's BS12 merge by XSI's orders
- Tested with various damtypes/locations/mobs but if i'm a dumbass and overlooked a problem feel free to punch me and revert this

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4762 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-27 02:14:21 +00:00
giacomand@gmail.com
4ef1ae9634 -Fixed changelings being unable to use their powers. (Sorry about that)
-Fixed runtimes with the camera tracking.

-Fixed an issue where alien larva couldn't heal oxygen loss damage.
-Fixed a runtime with cameranet chunks.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4761 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-26 23:36:15 +00:00
rockdtben@gmail.com
01a93bb78e Fixes issue 960
- Keeps simple animals simple.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4760 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-26 22:15:27 +00:00
Cael_Aislinn
a7bd4eeb42 some minor tweaks to character preview to be in line with tg
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 20:52:51 +10:00
Cael_Aislinn
640ce4fd5c WIP mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 20:10:58 +10:00
Cael_Aislinn
7ab7b989f2 added searif's new skrell hairstyles (missing lying icon states)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 19:01:47 +10:00
Cael_Aislinn
b618eeef82 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/controllers/configuration.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/factions.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/verbs/ooc.dm
	code/game/verbs/who.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/login.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/paperwork/paper.dm
	config/config.txt
	html/changelog.html
	icons/mob/human.dmi
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 18:49:18 +10:00