Commit Graph

5297 Commits

Author SHA1 Message Date
Ispil
a4074de7b0 Adds a /The to the holstering and drawing a firearm messages, for when the name of the user is improper or not capitalized. 2012-11-18 16:47:52 -07:00
petethegoat@gmail.com
b67262b32b Ported over BS12 style cameras, which photograph a 3x3 area. It's fuckin radical.
Removed /obj/item/weapon/camera while I was at it (unused).
New cameras are in modules/paperwork/photography.dm.
Standardised folder and paper naming a leetle bit.

Added a new gamekit sprite, also from BS12.

Path changes!
/obj/item/weapon/camera_test > /obj/item/device/camera

Updated all maps with the path changes, excepting oldstation.dmm.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5116 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 23:41:37 +00:00
Ispil
afe7e4642a Fix to Issue #1978. Removes the extra "t" in "the." 2012-11-18 16:38:01 -07:00
Ispil
d6505fd064 Fix to Issue #1972. Humans now spawn with full SE length, as do monkeys. 2012-11-18 15:40:55 -07:00
elly1989@rocketmail.com
796726543e message_admins() now only has one argument. The message you want to send. The find and replaces for %holder_ref% -> src=\ref[C.holder] and %admin_ref% -> src=\ref[C] are no longer needed. Instead we will be using _src_=holder to direct to holder and src= to direct to client (not needed, you can just omit the src parameter completely in your link)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5112 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 19:30:25 +00:00
cib
7b74e199c5 Fix to breath pressure tresholds.
This also increases default breathing speed a good deal.
2012-11-18 18:12:37 +01:00
RavingManiac
6ce738b716 Wrapping paper can now wrap storage containers (e.g. backpacks, boxes, pill bottles).
Packages now have the same w_class as the item wrapped inside, and the sprite of the package will also vary according to the w_class.
2012-11-19 00:30:11 +08:00
Chinsky
56c20b7fb3 Fixed couple of runtimes 2012-11-18 19:32:58 +04:00
cib
8947dc7a0e Lung damage now occurs pressure-based, not oxyloss-based. 2012-11-18 15:48:38 +01:00
RavingManiac
7c76e0758d Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-18 22:04:20 +08:00
elly1989@rocketmail.com
a10f6e0ec2 Added a switch inside client/Topic which can direct the topic call to a few frequently used destinations.
Before, when making a link to an admin tool, you done this:
<a href='?src=\ref[C.holder];parameter=1;>link</a>

Now, we do not need to use a reference to direct it to places like usr or usr.client.holder (or client, but you never needed src for that anyway)
usr: <a href='?_src_=usr;parameter=1;>link</a>
holder: <a href='?_src_=holder;parameter=1;>link</a>

This basically allows us to move a LOT of code outside of loops as we no longer have to create a \ref for every recipient of the message. They can all be sent identical links. A simple example of this would be in pray.dm Although it's most noticeable in the adminhelp code which is vastly simplified.

Adminhelp name spotting code thingy...whatever... looks for ckey matches first, then surnames, then forenames. This is to stop it possibly weirding out if there is a station full of "Ed"s of "Sarah"s

Prayer code no longer loads a new icon into memory every time a prayer is sent. Use image() not icon()!

key_name() no longer needs a reference for it's admin_link argument.

message_admin() pretty much doesn't need those extra arguments for finding and replacing %holder_ref%. I've got to go through all the code to check before I remove it though.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5105 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 08:27:11 +00:00
Chinsky
684679cefb Fixes issue #1971
Lasertag and practice beams won't explode tanks anymore.
2012-11-18 11:24:17 +04:00
Chinsky
ffe541adec Fixes issue #1970
Did not unlock CPR in case CPR was not completed successfully.
2012-11-18 11:05:21 +04:00
giacomand@gmail.com
a0e8bb51e0 -Increased the amount of units the sprayer used to make water slippery again.
-Added a verb to empty the contents of the sprayer onto the floor.
-Admin spawnable only poisonousness apple added.
-Apples will always be eaten in one bite, to balance it, the apple can only hold 20 reagents now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5104 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 02:13:00 +00:00
elly1989@rocketmail.com
97e95e4ab0 Moved "there can only be one" to the secrets panel (fun)
Removed the last of the old promotion/demotion code.
Permissions panel accessible via player panel.
Uncommented the attack log verb. I mistakenly thought it wasn't used.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5102 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 23:28:54 +00:00
giacomand@gmail.com
9894568500 -Cyborg Hypospray will no longer lose it's reagents when switching modes.
-Spaceacillin will now prevent the spread of diseases while it is a mob.
-Moved the "Create A Disease" code into a proc.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5101 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 22:28:48 +00:00
giacomand@gmail.com
e2acdcfe47 -Admins can now make their own advance diseases via the secret button! Instead of the useless "virus2" button, there will now be an option called "Create Your Own"! Use this button and pick from 5 symptoms to make your disease from.
-Fixed a bug where blood/vomit decals would be creating new viruses.
-Medical computer won't recognize advance diseases... for now.
-Used english_list when displaying symptoms.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5100 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 19:53:00 +00:00
petethegoat@gmail.com
06ef565d4d Some runtime fixes for the med data computer and hopefully the mule cart.
Fixes issue 526. MMI-Mech issues
MMIs can now change intent. There's no feedback, but they can at least function properly now in mechs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5098 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 17:44:29 +00:00
elly1989@rocketmail.com
0bca943424 Fixed OOC color being missing from the preferences screen (was using the wrong flag, changed from FUN to ADMIN)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5097 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 16:00:52 +00:00
Chinsky
6017e8c5db Can never have too much nullchecks. 2012-11-17 19:46:44 +04:00
elly1989@rocketmail.com
175b64cb9a Fixed an incorrect flag. Spawning was looking for DEBUG rights rather than SPAWN rights.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5096 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 07:02:38 +00:00
Kortgstation@gmail.com
121e8fa1d9 Split corpses into corpse and mobcorpse. Corpse is still used for decorating maps, mobcorpse is used for simple animals dropping human bodies.
Committing Brotemis's updates to his Wild West map/fixes he had for the associated code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5093 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 01:43:13 +00:00
giacomand@gmail.com
32a855049f -Cyborgs can use Page Down to activate an item in their held module.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5092 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 00:08:37 +00:00
Chinsky
ea4f34d53c Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/ZAS/FEA_system.dm
2012-11-17 00:20:23 +04:00
Chinsky
beb028d196 Using spawn in proc that deletes self was not so smart... GC outrun me. 2012-11-17 00:17:50 +04:00
Mloc
49a81a62b5 Merge pull request #1964 from AterIgnis/tajdarkee_iconsupd
Icons Updated & Tajarnan Darksight
2012-11-16 12:11:00 -08:00
petethegoat@gmail.com
b30abb014f Added a large variety of the alien queen for testing and feedback.
Thanks to WJ and Cawoijfaoiw for the sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5090 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 19:21:35 +00:00
petethegoat@gmail.com
ee66c32bd0 Updated the L6.
Fixes issue 1095. L6 Icons bugged after reload

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5089 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 18:52:41 +00:00
Chinsky
f520a79384 Added logging for what I believe to be cause of CPR failing.
Apparently SOMEHOW it goes into shake proc where it quietly returns meeting check for health being above zero.
I ahve no idea why it is not stopped bu check right before the shake proc call, that's what logging is for, maybe health was computed incorrectly, or threshold for crit is wrong.
2012-11-16 21:12:55 +04:00
Chinsky
650dc3dab8 Changed way CPR lock works, no dependancy on world time.stored time now.
When someone starts doing CPR, it locks. After 3 ticks after CPR is done it unlocks. No other mobs can do CPR on same mob while it is locked.
((also it's one of places that can make CPR not start so I wanted ot replace timer with more simple semaphore))
2012-11-16 20:11:28 +04:00
aranclanos@hotmail.com
0258d5be22 -Changed all minerals path from /obj/item/stack/sheet to /obj/item/stack/sheet/mineral. (This change excludes glass, Rglass, metal and plasteel)
-Reduced the chunks of code about minerals in door_assembly.dm

Preeeetty much this commit is just to update all the files to the new path of the minerals. From here, if I can, I'll start changing one by one to remove the huge chunks of code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5087 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 15:00:09 +00:00
Ater Ignis
8c5b8f8d50 final pass of merging with my branch
I hope I have not forgot anything
Still, it compiled for me at least, and passes test cases i did
2012-11-16 18:54:43 +04:00
Ater Ignis
4ed9b40cb9 tajarans see_in_dark -> 8, disembodied organs rendering correction 2012-11-16 18:41:26 +04:00
Ater Ignis
7f55f25ead comments, and better hulk color 2012-11-16 17:06:47 +04:00
Ater Ignis
cc79346c3b forgot one row 2012-11-16 16:02:36 +04:00
Ater Ignis
c140e3b7d0 update to remote view 2012-11-16 15:55:41 +04:00
Ater Ignis
46bd2ce7e6 human icon generation update, tajarnan darkseeing
*lying icon generated from standing one
*sprites for dismembering major races (tajarnan,skrell,soghun)
*tajarnans can see in darkness better than others
2012-11-16 15:19:20 +04:00
Chinsky
262315d15c Added chance to get hands bloody during operation.
Or being covered in blood when you nick an artery.
Moved bloodying code in separate procs.
Made possible to force wounds to be internal, made some wounds in failed surgery steps internal.
2012-11-16 13:49:28 +04:00
Cael_Aislinn
7b7a200155 added nullcheck to ZAS func, fix for severed powernets still being connected
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-16 18:53:03 +10:00
Kortgstation@gmail.com
a814ff7be4 Syndicate simple animals will only attempt to destroy obstacles when chasing a target. Now the away missions wont start horribly smashed up.
Committing Brotemis's away mission and related code. I think he wanted to make a few more changes, but it should be functional.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5085 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 02:32:38 +00:00
elly1989@rocketmail.com
43dfc564f4 Removing an inconsistent restriction from the rightsedit thing.
I'll need to talk to Erro to figure out what to do with that.
Personally, I'd like to think people with PERMISSIONS rights could be trusted but you never know >_> bloody internet

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5083 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 01:57:48 +00:00
d_h2005@yahoo.com
2aadd58680 Removes duplicate watermelon define.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5082 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 01:08:34 +00:00
d_h2005@yahoo.com
34905c08d4 Adds kudzu plants, which can be grown in hydroponics trays. They are only obtainable by injecting mutagen into a tray with lots of weeds.
Glowberries have uranium inside them now instead of radium, which caused overlap since glowshrooms also had radium.
Also tweaked cocoa pod sprites a little bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5081 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 23:56:28 +00:00
Mloc
aab9c1b946 Merge pull request #1952 from comma/master
More fixes for the fix throne.
2012-11-15 12:52:48 -08:00
Chinsky
cda5f5c755 Fixes buckled people being still buckled after teleportation with artifact.
Issue #1854
2012-11-16 00:49:49 +04:00
elly1989@rocketmail.com
25b61bae72 Removed the infra_sensor define for noddie.
Integrated the sql and standard admin_rank stuff a little. Still needs some work.
Permissions Panel has a sexy floating search bar. The scripts and stylesheets are external files which will be sent to every client at connect, so they can be used in any panel you wish with no additional overheads.

If there are any bugs with the permissions panel (particularly the search bar) please let me know. thanks.

rights2text now has a seperator argument. It defaults to "", but can be any string, for instance "<br>"

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5080 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 20:35:37 +00:00
petethegoat@gmail.com
323c527e9d Committing a fix for recursive books
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5079 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 20:30:36 +00:00
petethegoat@gmail.com
2c3a60e350 You can carve out books with a pair of wirecutters or a kitchen knife to create a handy hiding place.
Dice are no longer the same size as fire extinguishers

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5078 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 20:15:49 +00:00
Chinsky
a1ccbfe198 Fixes issue #1889
Timers, proxy and other trigger =RSD= properly again.
2012-11-15 23:39:28 +04:00
Mloc
be9ab53289 Merge pull request #1951 from CIB/master
Fixes
2012-11-15 10:47:47 -08:00