Commit Graph

1086 Commits

Author SHA1 Message Date
Ater Ignis
e79df68ef3 added new assembled timer-igniter assembly and added that to default chem-grenades 2012-11-01 17:49:21 +04:00
Ater Ignis
72f3c70da9 primed grenades must not be disassembable easy 2012-10-28 11:20:42 +04:00
Ater Ignis
2acba34e11 fix of names in grenade 2012-10-27 19:48:48 +04:00
Ater Ignis
6337048aad updated grenades, now with remote control, proximity control and timer control for your choosing 2012-10-25 19:56:32 +04:00
headswe
0d98248b6f Merge pull request #1821 from comma/master
Pain & Other Ported Things
2012-10-23 08:47:30 -07:00
Chinsky
b46c887469 Ported implants.
Compressed matter implant.
Death alarm implant.
Made explosive implant work like pre-merge: trigger on code phrase instead of host's death.
2012-10-22 17:52:27 +04:00
Cael_Aislinn
c0e7ad00b2 merge fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 20:25:27 +10:00
Cael_Aislinn
dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 20:15:05 +10:00
Cael_Aislinn
9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 19:35:03 +10:00
Chinsky
ad7cd0ed58 ID biometry.
Bloodtype, DNA and fignerprint are back to ID
2012-10-22 00:41:43 +04:00
Chinsky
5e4273c919 Fixed runtime in secure briefcase code. 2012-10-21 17:58:54 +04:00
Chinsky
7ae59ba6f7 Slapped a few nullchecks near reported runtimes. 2012-10-21 16:41:44 +04:00
giacomand@gmail.com
6616314ca6 -Cleaned up Simple Animals by having a hostile class which will handle standard attacking, then the childs of that class can override the procs to do something different, if needed.
-Cameras won't shock you anymore, when cutting the power wire.
-Cultists cannot be gibbed by placing more runes that is allowed, instead it says no and to clear any unused runes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4926 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 01:31:41 +00:00
d_h2005@yahoo.com
15c4b01c9f -Monkeys can now wear luchador and sexy clown masks, among others.
-Wood chairs are actually constructable now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4922 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 19:17:21 +00:00
Chinsky
179c510547 Makes briefcase start without paper.
All jobs that start with it have plenty of places to get paper.
2012-10-20 22:50:01 +04:00
Cael_Aislinn
01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 01:25:04 +10:00
Cael_Aislinn
2a07ba0f6e mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 01:04:37 +10:00
Cael_Aislinn
2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 00:25:05 +10:00
aranclanos@hotmail.com
e4bcc80405 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4917 316c924e-a436-60f5-8080-3fe189b3f50e 2012-10-20 02:51:12 +00:00
giacomand@gmail.com
28fbd01e7f -Added a new, and admin spawnable only, machine which can turn humans into Cyborgs. Probably can be used for Robot Uprising events. The human has to be lying down and alive to be Borged. When spawned a conveyor belt will spawn on the left and right side too.
-Reduced the duration of the flare. I think putting it in process() made it last longer.

-Added some null checks in camera chunks.

-Large NarSie now force calls the shuttle and displays a threatening warning message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4915 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 02:13:40 +00:00
Chinsky
5513280add Fixed runtime in C4 code 2012-10-19 14:31:54 +04:00
Chinsky
16e6f178a4 Buffed fuel tank explosions. 2012-10-18 15:40:55 +04:00
Chinsky
886119787d Arrivals computer fixed forever. 2012-10-18 10:09:39 +04:00
Asanadas
0ba466e881 Removing Soghun stutters, fix for infinite BoH in BoH. 2012-10-17 19:18:17 -04:00
cib
a1aa3ddecf Ported limb selection. 2012-10-17 20:08:34 +02:00
Asanadas
e2abd0a9b8 Commented out BoH on BoH Singulos. 2012-10-16 20:52:28 -04:00
giacomand@gmail.com
2ae7aee08c Added flares! One time activation item that stays on until it runs out of fuel.
You can randomly get them from emergency toolboxes, instead of a flash light.
Icon by Ausops!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4892 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 16:48:22 +00:00
petethegoat@gmail.com
981ea58a47 Updated bedsheets and linen bins. Moved bedsheets out of defines, into bedsheet_bin.dm.
Standardised airlock_control.dm, and removed some useless spawn()s.
Updated a few things in paperbin.dm.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4891 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 14:17:06 +00:00
giacomand@gmail.com
964b86fdbd New Changeling Powers!
Hive Channel/Hive Absorb. Allows you to share your DNA with other changelings, very expensive chemical wise to absorb (download), not so much to channel (upload)! You cannot achieve your objective by sharing DNA.
Mimic Voice! You can form your voice of a name you enter. You won't look like them but when you talk, people will hear the name of who you selected. While you're mimicing, you can't regenerate chemicals.
Extract DNA! A power that allows you to silently sting someone and take their DNA! Meaning you do not have to absorb someone to become them. Extracting their DNA doesn't count towards completing your objectives.

Misc:

New livingmob proc GetVoice(), used by changeling mimicing and voice changers. Will return the name of the voice that should be heard by people.

Got rid of the chance to "feel" like someone isn't who they are.
Commented the check for someone's gender being incorrect in life. Looks like the bug hasn't re-occured since it was put in place.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4890 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 13:21:44 +00:00
Pobiega
8991f73efc Fixes issue #1772, bandaging already bandaged wounds. 2012-10-16 10:35:13 +02:00
cib
874d2c1519 Health analyzer now shows if an organ is bleeding. 2012-10-15 19:54:17 +02:00
Cael_Aislinn
548f60d25d Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/gamemodes/events.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/gateway.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/sound.dm
	code/global.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/handlabeler.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/photocopier.dm
	code/modules/paperwork/stamps.dm
	code/world.dm
	html/changelog.html
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-15 23:17:18 +10:00
Chinsky
ad34ad9da4 God dammit, fix. 2012-10-15 16:48:13 +04:00
Chinsky
1bcfdfbd98 Now lighters only burn hand user is holding them. Bye bye, 80% of crew groin burns. 2012-10-15 15:30:42 +04:00
Chinsky
385dbe9fe9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-15 15:13:57 +04:00
DarkTechnomancer
b99dae5c89 Fixed health analyzers 2012-10-15 02:57:48 -04:00
Chinsky
988928b086 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-15 01:52:02 +04:00
Asanadas
1fcaf5b376 Nerf cheap lighters.
Signed-off-by: Asanadas <asanadas@hotmail.com>
2012-10-14 14:42:08 -04:00
Chinsky
8427947bd7 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm
2012-10-14 20:39:26 +04:00
petethegoat@gmail.com
65f4910c94 Updated trashbag code a teeny tiny bit. Mostly just changing it to use proper text styles.
Added a world.log message when away missions are loaded.
Fixed a spelling error in stationCollision.dm.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4868 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 02:01:54 +00: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
petethegoat@gmail.com
c4382905e5 Stamps are applied based on the icon_state of the stamp. Saves a switch.
They are also offset by a random amount.

Sosjerky is now properly named.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4857 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 18:55:09 +00: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
5a1df1362a Medical stacks(bandages etc.) now are non-instant again. 2012-10-13 05:45:15 -07:00
Chinsky
b2d3d880e1 More work on surgery system.
Appendectomy fully working
Bone surgery working

Added bone gel and bone setter items

Made bandaging stop bleeding instantly, instead of waiting for next wound update.

Added variabe to groin organ to track appendectomy stage.
2012-10-13 16:28:10 +04:00
cib
06d47ea2dd Cyborgs can now use their respective channel. 2012-10-12 14:56:34 -07:00
cib
5ef6399238 Fixed a ton of the issues in http://piratepad.net/9CwFobI4lZ 2012-10-12 13:58:18 -07:00
Mloc
33a3d3cd97 Merge pull request #1738 from CIB/master
Dismemberment
2012-10-12 09:42:31 -07: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
johnsonmt88@gmail.com
e3b3ff836b The wizard's teleport scroll now only works if the wizard actually has it. Fixes issue 997.
I've also moved the teleport scroll define from defines/obj/weapon.dm into scrolls.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4846 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-11 23:07:34 +00:00