Commit Graph

2330 Commits

Author SHA1 Message Date
Kortgstation@gmail.com
e6296952fa Fixed the medkits on my map being empty.
Removed several turrets from the syndicate ships, as they made them impossible to leave/killed the syndicate mobs.

Gave the syndicate mobs slightly more health, as the unshielded ones were dying before they could react.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4867 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 01:54:19 +00:00
Kortgstation@gmail.com
b5c2593e53 Changed my mind, only the syndicate mobs in RIGs are slower
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4866 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 01:12:20 +00:00
Kortgstation@gmail.com
ec10add191 Fixed the syndicate NPC shields. They only block 1/5 attacks now
Made syndicate NPCs slower.

Made the e-sword NPCs do less damage.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4865 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 01:01:33 +00:00
DarkTechnomancer
4bf6833a62 Fixed flavor text 2012-10-13 19:27:43 -04:00
headswe
c04c26fa29 Merge pull request #1759 from headswe/master
Fixed Organspam (Maybe)
2012-10-13 15:44:42 -07:00
Head
085d357b4b Hopefully fixed organ spam. 2012-10-14 00:43:23 +02:00
Chinsky
c3b53af100 Commiting for the night, in case KGB steals my laptop.
Pretty much finished surgery system.
-working appendectomy, bone surgery, eye surgery, face surgery, brain surgery (humans only) and metroid core surgery.

-moved operation stages tracking vars to one op_stage datum. Left brain opstage var alone because way too many things reference it.

-added bone gel and bone setter.

-added check for surgery tools, so new doctors won't beat shit out of patients on optable too often.

-pretty much emptied surgery_tols.dm, it was unneeded by this point.

Still need to test it more, slap sanity checks everyfuckingwhere.
Also more literate messages written with help of trained monkey (faux).
2012-10-14 02:15:23 +04:00
giacomand@gmail.com
940808ee86 -New facehugger animation by Sly.
-Moved "debug_controller" to badmin, so if the controller needs debugging a game admin can promote a coder to badmin and allow them to debug it.
-Fixed an issue with aliens having two different status tabs.
-Moved all facehugger icons to icons/mob/alien.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4862 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 21:26:30 +00:00
baloh.matevz
3def1bd57a - Added corgi puppies to code:
Screenshot:
http://www.kamletos.si/puppy.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4860 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 20:31:35 +00:00
giacomand@gmail.com
3dd4f8cbc5 -Optimized freelooking a bit.
-Larva can now die, instead of staying in critical.
-Improved the prison break event.
-Added the cameranet to the list of debuggable controllers (I know it's not technically a controller but it seems like the best place to be).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4858 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 19:52:41 +00:00
cib
160328741e Made the human/drip() proc produce larger pools. 2012-10-13 10:08:12 -07:00
cib
31093ce666 More messages for low blood. 2012-10-13 09:59:17 -07:00
cib
e77afd5ab9 Added bleeding and blood transfusion. 2012-10-13 09:45:33 -07:00
cib
4f1d301880 Examine now only reveals you're dead by checking pulse. 2012-10-13 08:57:03 -07:00
Chinsky
341275fa69 Fixes get_organ not working properly for eyes and mouth target zones. 2012-10-13 19:35:16 +04:00
petethegoat@gmail.com
c4f9b43020 Moved para and sleepy pen defines out of weapon.dm.
Updated flashlight code a little.
Added inhand sprites for desk lamps.
Standardised modules/paperwork.
Decapitalised a bunch of mining items.
Slightly reverted update_icons.dm, so we're not looping through mutations more than we need to. Also, skeletons can now wear lipstick!

A few other things which aren't worth listing individually.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4855 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 14:37:28 +00:00
cib
98386354bb Fixed a bug in radio code where it would expect the user to be a human. 2012-10-13 06:37:18 -07:00
cib
9c55f8c8ac Ported BS12 medbots. 2012-10-13 06:33:05 -07:00
cib
8dc75dfa3c Fixed the problem where :h would be holosay even for cyborgs. 2012-10-13 05:46:09 -07:00
Chinsky
9cc4470af8 Fixes lack of children organs. 2012-10-13 16:26:15 +04:00
Kortgstation@gmail.com
bc52355d77 Bluespace artillery actually checks for its cooldown between shots now.
Syndicate simple animals wont shoot a corpse forever. They also fire slightly less frequently in general.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4850 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 01:35:34 +00:00
cib
9ae4bbfdf8 Fixes the say_quote runtime. 2012-10-12 16:15:34 -07:00
cib
c0e0e7d116 Remove the silly examine messages that give away wounds even when under clothing. 2012-10-12 15:47:01 -07:00
cib
c691f76c65 Small bug with engineering cyborg radio channels. 2012-10-12 15:34:40 -07:00
cib
e05b9fa2b6 Fixed a runtime with organ generation. 2012-10-12 15:03:32 -07:00
cib
06d47ea2dd Cyborgs can now use their respective channel. 2012-10-12 14:56:34 -07:00
cib
32e839f683 More and yet more fixes from the piratepad.
- AI laws now default to Nanotrasen laws
- Removed half the random events
- Milk now in chem dispensers
- Hunger rate decreased by half
2012-10-12 14:25:54 -07:00
cib
89263fc9f6 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-10-12 13:19:20 -07:00
cib
8c157bff18 Added missing groin. 2012-10-12 12:36:25 -07:00
Mloc
046348db49 Merge pull request #1744 from CIB/branch
Several changes to organs + bugfix
2012-10-12 12:15:57 -07:00
cib
99313f5a94 More fixes to wounds.
- Added more wound descriptions
- Wounds now have "bleeding" and "bandaged" in their examine description
2012-10-12 12:08:00 -07:00
baloh.matevz
96b53e1189 - Added numeric value polls. These allow multiple options to be present in each poll, each option has a drop-down list that goes from a low value (-3 in screenshot) to a high value (3 in screenshot), both of these can be set per-option. Along with text descriptors for the lowest value option, middle option and highest value option (In the screenshot 'Worst', 'no change' and 'Best')
Example screenshot (if you ignore the poll text):
http://www.kamletos.si/numval%20polls.PNG

Also note that the screenshot above only has one option (or question). It can have an unlimited number.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4848 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-12 18:37:36 +00:00
Mloc
33a3d3cd97 Merge pull request #1738 from CIB/master
Dismemberment
2012-10-12 09:42:31 -07:00
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
cib
fb60301594 Revert "Revert's cib's BS12 merge by XSI's orders"
This reverts commit a6e7c085ef.

Conflicts:

	baystation12.dme
	code/datums/organs/organ_external.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/mob_defines.dm
	code/setup.dm
	icons/mob/dam_human.dmi
	icons/mob/human.dmi
2012-10-11 14:31:31 -07: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