Commit Graph

8373 Commits

Author SHA1 Message Date
Cael_Aislinn
d09d7bf313 changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:50:57 +10:00
Cael_Aislinn
6d1ea0548d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress
Conflicts:
	code/modules/customitems/item_defines.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:08:47 +10:00
Chinsky
f0ac799952 Merge branch 'bandages' 2012-12-02 21:17:11 +04:00
Cael_Aislinn
d55170ab97 fixed an extra line added
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 01:04:14 +10:00
cib
77943e04f3 Balance fix to random blob event.
It now lasts 20 minutes instead of 5, and accordingly each blob
advancements happens every 30 seconds instead of every 7 seconds. This
means more time to respond to the blob, but overally the blob can still
be just as harmful if nothing is done about it.
2012-12-02 13:58:57 +01:00
cib
bce8c4cfee Merge github.com:Baystation12/Baystation12 2012-12-02 13:36:10 +01:00
Chinsky
507dc0c496 Better feedback messages and ability to target groin, hands and feet. 2012-12-02 16:30:24 +04:00
Chinsky
66d0f554f6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-02 00:14:03 +04:00
Chinsky
0a9b6f6bbe Removed armor suit from Captain's spawn gear 2012-12-02 00:03:30 +04:00
Chinsky
0b614a488c Made bandages stop bleeding when applied, not waiting until next 20-tick organ update cycle. 2012-12-02 00:02:43 +04:00
Chinsky
ab440fbf7d Fixed compile error in custom items.
Made rigs protect against radiation again.
2012-12-01 18:35:27 +04:00
Cael_Aislinn
3b6c00eae5 made space ninja a toggleable client option
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:07:18 +10:00
Cael_Aislinn
c8f603cebd WIP stuff for skin styles sprite accessory
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:07:02 +10:00
Cael_Aislinn
7e3f58cea2 CPR optimisations, made hypospray visible on the map
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:06:19 +10:00
Cael_Aislinn
9391d55e6e compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:05:05 +10:00
Cael_Aislinn
2f7baa26f8 antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 17:49:34 +10:00
Chinsky
85c2af3871 Started cleanup of medical stacks code.
Removed silly way to get targeted organ.
Removed child organs being affected sometimes.
2012-12-01 09:04:20 +04:00
SweeperM
5c9738aab6 added requested changes 2012-12-01 03:49:41 +00:00
Chinsky
c13ddeeb9f Merge branch 'master' into surgery
Conflicts:
	code/datums/organs/organ_external.dm
2012-12-01 07:16:40 +04:00
Chinsky
2e2c1e8c4c Merge branch 'master' into crates 2012-12-01 07:14:31 +04:00
SweeperM
b8a12b0b52 Fixes to lighting
-Fixed #2005 (for sure!)
-Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of.
-Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on.
2012-11-29 23:01:51 +00:00
GauHelldragon
01828f8a02 Added more comments 2012-11-29 12:21:38 -08:00
GauHelldragon
06ae2ded6f Change - Robotray only picks up food/drinks/condiments 2012-11-29 12:10:30 -08:00
MrYeti
1c3d72e471 Added My own Custom item and Misterbook's pipe spawning in his backpack.
Also deleted some stuff that were requested for deletion.
2012-11-28 16:38:40 -05:00
GauHelldragon
17440ff756 Fixed blood regen bug
Nutriment is stored in reagents. Vessel is only for blood.
2012-11-28 12:37:27 -08:00
GauHelldragon
2c47afc22e Roboitems - Printing Pen
Allows service borg to rename paper. Click on pen to toggle between writing and renaming mode.
2012-11-28 03:03:20 -08:00
RavingManiac
e924aa8fc3 "Hidden" HE pipes added. HE piping in the kitchen cold room allows a freezer unit just outside the cold room to lower the room's temperature. A human inside the cold room with the temperature set to minimum will typically expire within a few minutes. 2012-11-28 16:33:06 +08:00
cib
e11bab8ed7 Balancing emergency air tanks.
- Reduced volume by 33%, since testing revealed they currently last nearly 10 minutes
- Made *everyone* spawn with emergency air tanks, as opposed to random jobs like lawyer etc.
2012-11-28 02:32:04 +01:00
GauHelldragon
09f1d74566 Fixed typo in tray description 2012-11-27 15:24:44 -08:00
GauHelldragon
5e74a9803c Modified Service Bot's Tray to actually be useful
Service Borg's tray now can load and unload items.
2012-11-27 15:16:59 -08:00
MrYeti
8442a9359e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-27 15:17:06 -05:00
MrYeti
69992184d3 Deleted the items! 2012-11-27 14:16:21 -05:00
GauHelldragon
c896fd6fcb Added feedback messages for when service bot auto-refills their drink containers.
Tweaked battery charge usage for refilling, and fixed bug where it would not refill if you empty it completely.
2012-11-27 05:47:43 -08:00
Hawk-v3
0e52548c9e Merge pull request #2019 from CIB/master
Fix stuff
2012-11-27 03:42:59 -08:00
cib
7bc9d60c0e Possible fix for air tanks running out too quickly. 2012-11-27 12:36:52 +01:00
MrYeti
f1b328f1fb Finished up Roaper's Custom item
Now ready to push!
2012-11-26 18:55:54 -05:00
MrYeti
ded839e0f7 Added Custom Item: Monogrammed Handkerchief 2012-11-26 17:15:03 -05:00
MrYeti
fda5be14de Added Roaper's Custom Item
Deleted some unwanted custom item stuff as well
2012-11-26 16:40:19 -05:00
Mloc
1923260b5e Merge pull request #2012 from comma/master
Fixes for surgery
2012-11-26 08:59:20 -08:00
elly1989@rocketmail.com
ee67e6a0d8 Runtime fix for null.occupations undefined var
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5200 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-26 12:44:02 +00:00
ericgfwong@hotmail.com
1327ddb017 Detectives can once again use Security Records computers.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5199 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-26 03:02:05 +00:00
elly1989@rocketmail.com
87814b9258 Reordered world/New() a little to hopefully fix the issues with hair and facial-hair style-preferences 'resetting'.
Added CHAT_GHOSTSIGHT to toggles default
Added some .cd stuff to preferences savefiles. Doubt it'll fix anything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5198 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-26 02:52:44 +00:00
giacomand@gmail.com
1f5a5e2e18 Fixed a runtime with fingerprints.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5197 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-26 02:39:47 +00:00
ericgfwong@hotmail.com
09e2c5b069 Added Gateway access. Only the RD, HoP, and Captain start with this.
New access levels in the brig:
    -Brig access now opens the front doors of the brig, as well as other lower-risk security areas.
    -Security access allows you into the break room and equipment lockers.
    -Holding Cells allows you to use brig timers and lets you in the Prison Wing.
    -The Detective no longer has Security Equipment access.

Significantly increased max cloneloss penalty for fresh clones to 40%.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5196 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-26 01:18:28 +00:00
giacomand@gmail.com
7cd6d5eaa4 -Added the previously unobtainable hallucigen disease to the virus crate. Increased the virus crate from 20 to 25.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5194 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 21:56:18 +00:00
giacomand@gmail.com
03dad49037 -I forgot a symptom file and the .dme.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5193 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 21:33:40 +00:00
giacomand@gmail.com
af523d3e8f Added a new symptom with a high level, so that it's not possible to gain through mutations.
Gave the high level symptoms their own preset diseases and added them to the virus crate, along with a bottle of mutagen.

Several disease fixes, such as disease stages going below 0. Diseases which spread by blood will longer spread when you touch someone (i.e: click on someone)

I also did some cleaning up with comments.

Made handheld radios broadcast if their messages aren't sent on the same level as they're on, meaning that turning off the relay to the station will not make it impossible to communicate with others with radios.

Made some events only effect people on the station Z level.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5192 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 21:32:07 +00:00
petethegoat@gmail.com
d9480a1407 New unarmed beartrap sprites by Cheri.
Slightly improved beartrap code while I was there, mostly standardisation and formatting stuff as usual.

Fixed the Chaplain's PDA spawn.

Reduced the chance of stealthy hulk wall smashing. All but one of the messages will attempt to go over the radio now.
Changed hulk resist text colour to red because it was barely readable in green.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5191 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 20:57:08 +00:00
petethegoat@gmail.com
c69f0cab36 Removed /obj/effect/deskclutter at last.
Updated all maps. (and updated stationCollision.dmm to have new hivebots, cmon kor)

Removed the action button from the flare, as you only ever turn it on once.
Removed a bunch of unused sprites in items.dmi.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5190 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 19:58:28 +00:00
petethegoat@gmail.com
2386920be8 Fixes issue 1123. Nuke Ops pinpointers are apparently broken. As in "mode-breaking" broken.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5189 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 18:10:58 +00:00