da8fcbc037
Added a bear pelt hat for Inti.
...
Added ranged and melee russians for Inti.
Fixed up pirates/hivebots/viscerators. Had some vars wrong.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5185 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 03:11:19 +00:00
76ede03966
Moved mob/var/footsteps to /obj/item/clothing/shoes/clown_shoes/var/footsteps
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5166 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 17:43:25 +00:00
afe9e93c05
Fixed name of the medical rig
...
Fixed the exile implant locker.
Made syndicate simple animals slightly squishier (block chance lowered).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5160 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 08:15:07 +00:00
28db1ef2f7
Added medical rigs, sprited by Majorsephiroth. Right now their only special "medical" feature is holding medkits in the suit storage slot, I'll try to figure out more stuff to give them.
...
Added two of them to EVA (replaced two normal suits).
Updated changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5145 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-21 07:02:19 +00:00
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
afe7e4642a
Fix to Issue #1978 . Removes the extra "t" in "the."
2012-11-18 16:38:01 -07:00
ecdb9ab118
Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it.
2012-11-11 14:33:33 -07:00
0b3ca8d0a6
Fixes Issue 1082 - 'Orange' shoes dyed still being chained by handcuffs.
...
Washing machine code makes me cry, I will rewrite that... Soon(TM)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5028 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-08 05:51:20 +00:00
0e589d575c
Fixes Issue 1066 - Suits having a wrong blood overlay.
...
I added a new var for suits, blood_overlay_type.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5024 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 09:29:40 +00:00
8f0ae22884
- Reverted the size reduction from r4996.
...
This is simply not acceptable:
- http://www.kamletos.si/screen%20overlay%20reduced%20size.png
- http://www.kamletos.si/screen%20overlay%20reduced%20size2.png- Made being in an area with extremely low pressure cause some damage (2 per tick)
- Reduced the amounts of oxy damage per tick from 1/ 2 / 4 to 0.5 / 1.5 / 3, depending on your body temperature.
- Reduced the maximum amount of high pressure damage per tick from 7 to 4. Slightly reduced the damage coefficient for pressure damage. This is to prevent insta-kills in high pressure areas. I still can't believe poly originally set it to 20 per tick...
- Added a maximum amount to how much your body temperature can change in each tick. It can go up or down by, at most, 30K per tick.
- Space suits and the captain's armor now protect against pressure damage
- Fixed some more of poly's awful code. The STOPSPRESSUREDMAGE flag now defines whether you take damage or not. You still need to have both a helmet and suit with that flag on to be fully protected from pressure damage. This will make the pressure damage indicator actually show what kind of pressure is affecting you and not just pretend like you're not taking damage, even if you are, while in a space suit:
//Poly code<TM>
if(istype(wear_suit, /obj/item/clothing/suit/space)||istype(wear_suit, /obj/item/clothing/suit/armor/captain))
--pressure.icon_state = "pressure0"
else
--...
- Standardized /obj/item/examine().
- Added the important stuff to the changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5004 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-05 05:59:50 +00:00
a2e83e962d
Alternative titles system.
...
Custom character records.
Different clothing for alternative titles.
2012-10-31 08:40:51 +04:00
513e4463c5
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/clothing/spacesuits/rig.dm
2012-10-29 07:23:19 +04:00
23801464cf
Merge remote-tracking branch 'upstream/master'
...
Conflict resolved:
code/modules/clothing/spacesuits/rig.dm
2012-10-29 01:29:47 +00:00
95d5912c2d
Readds missing wizard rigsuit.
2012-10-29 04:54:57 +04:00
9185b5189c
RIGs have heat resist.
...
Firesuits have cold resist.
You're welcome. ^v^
2012-10-28 23:39:50 +00:00
9fda27f6a9
Merge pull request #1820 from Spamcat/master
...
Alt satchels, adjustable masks, ashtrays.
2012-10-28 02:33:19 -07:00
fe6ed49062
Atmospheric Pressure Suits
2012-10-28 07:11:51 +00:00
8e877047d9
Reverted Suit Cramping
...
Hawk_v3
2012-10-28 07:01:02 +00:00
d38670f75a
heavy suits cause cramps over time (minor brute damage at intervals of a few minutes), also made species clothing incompatabilities actually affect the relevant body parts
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-27 23:16:12 +10:00
861a036941
Added medical and security record filing cabinets.
...
Added a pig mask.
Changes to the map:
Added a safe to the vault, and a stethoscope on the nuke shuttle.
Added a camera and hand labeler to art storage.
Added a medical cabinet to the Detective's office.
Updated the changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4962 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-26 23:29:34 +00:00
665c840da3
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-26 23:57:05 +04:00
eb72f2d48e
Fixed couple of holster messages typos.
...
Reworked way isHolster() works.
Fixed bug with detecive revolver, making it impossible to reload.
2012-10-25 16:32:57 +04:00
236780d8c6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-25 03:42:20 +04:00
9d34691b82
Added holsters and bunny slippers.
...
Holsters work a bit different from before.
They utilize system for clipping things on uniform.
So now holster can be worn on any clothing.
Also it can now hold any handgun(or what I assumed to be handgun).
2012-10-25 02:00:48 +04:00
2fe846065a
-Added "give disease" VV dropdown option.
...
-You cannot spread diseases which are marked as SPECIAL or NON_CONTAGIOUS via blood injections.
-Carp no longer drift in space.
-Captain helmet now protects you from facehuggers.
-All humanoid aliens can now Regurgitate.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4946 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 00:29:27 +00:00
7183a7c3d3
Merge https://github.com/Baystation12/Baystation12
2012-10-23 17:56:00 +04:00
2cea1ecf7e
Merge https://github.com/Baystation12/Baystation12
2012-10-22 17:55:05 +04:00
59beeab301
Adjustable masks.
2012-10-21 23:23:08 +04:00
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
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
c8b7227329
Mixup in forensics jacket path
2012-10-18 10:09:14 +04:00
da147b083c
Added Forensics Technician jackets to Detective wardrobe.
2012-10-17 03:28:59 +04:00
9e0d1ca164
-Added welding goggles, sprites by WJohnston. Aren't on the map yet as I'm waiting for it to be free.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4893 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 21:30:01 +00:00
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
840ed30875
Fixed a spelling error in the Jensen HoS coat. Sponsored by tasty Trenchoats.
...
Signed-off-by: Asanadas <asanadas@hotmail.com >
2012-10-14 15:04:00 -04:00
e00fd0fd4b
-Fixed the flags for head items. Most space helmets will protect your face.
...
-Welding mask will protect your face if it is down.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4874 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 07:33:19 +00:00
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
825a7dcbf9
various mergefixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-09 22:49:38 +10:00
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
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
5110786735
-Adds the missing sprites to that cute witch hat, and allows it to be spawned in the theater, along with ausops' cute sundress because it's also cute and I didn't have anything else to spawn with it. honk.
...
Let's keep gearing up for a great halloween!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4803 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-03 22:17:17 +00:00
60bce6c53b
-Adds a new wizard artifact, the gem-encrusted hardsuit. Attack protection is equal to the highest values of robes + normal rig suit, and it allows spellcasting like a normal set of robes. Maybe now wizards can stop dying after blinking into space/teleporting to Borg Deathsquad Arrived.
...
And hopefully they WON'T use it to explore the derelict all around every round. We'll see.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4794 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 05:34:03 +00:00
8be72ec797
Added some stand-in sprites for medals.
...
They remain admin-spawn only until there's proper sprites for them.
The only one which isn't admin-spawn is the one the captain spawns with (it's on his jumpsuit)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4786 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-30 20:01:10 +00:00
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
283ae84dad
various mergefixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-22 21:37:42 +10:00
e645d78f11
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/datums/organs/organ_internal.dm
code/datums/vote.dm
code/defines/atom.dm
code/defines/procs/gamehelpers.dm
code/defines/turf.dm
code/game/algorithm.dm
code/game/cellautomata.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/jobs/job/captain.dm
code/game/machinery/computer/ai_core.dm
code/game/machinery/computer/law.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/teleporter.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/electricchair.dm
code/game/turfs/turf.dm
code/game/vote.dm
code/hub.dm
code/modules/admin/admin_verbs.dm
code/modules/awaymissions/zlevel.dm
code/modules/client/client defines.dm
code/modules/food/food.dm
code/modules/food/meat.dm
code/modules/food/recipes_microwave.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/hud.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/login.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/mob_defines.dm
code/modules/mob/new_player/login.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/photocopier.dm
code/setup.dm
icons/effects/genetics.dmi
interface/interface.dm
interface/skin.dmf
maps/RandomZLevels/fileList.txt
various misc mergefixes and todos
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-22 21:29:04 +10:00
e317396894
Removed the obj/screen/MouseEntered and MouseExited() proc defines as they cause clients to send more data to and from the server fairly constantly and create additional overheads for little purpose. I'll do a poll on the forums to see if people still want the intent switcher changed from a toggle to a 4-quadrant switch thingy like other servers have. From the DM reference:
...
"Don't define this unless you need it, because it generates extra communication that is otherwise avoided. Defining it on only the objects that require it reduces overhead"
I've tested it and it has these overheads for all hud objects.
Added stethoscopes. They are a tie. You can use them to listen for somebody's pulse. Mostly a RP-fluff item. "You place the stethoscope against her chest. You hear a healthy pulse and respiration." You need help intent and it will give different text for each body-part. I might make it more detailed later.
Removing ties from a uniform will now try to place it in you hands.
Stethoscopes placed in a few places around medbay.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4682 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-12 14:13:25 +00:00
dc3f6f2239
Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/defines/obj/weapon.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-04 22:23:50 +10:00
c4bd191222
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/defines/obj.dm
code/game/gamemodes/events.dm
code/game/machinery/newscaster.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/structures/stool_bed_chair_nest/bed.dm
code/game/turfs/turf.dm
code/modules/awaymissions/zlevel.dm
code/modules/maps/fromdmp.dm
code/modules/mob/living/silicon/ai/freelook/eye.dm
code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/mob_movement.dm
code/setup.dm
icons/mob/uniform.dmi
icons/obj/closet.dmi
icons/obj/clothing/uniforms.dmi
maps/RandomZLevels/assistantChamber.dmm
maps/RandomZLevels/fileList.txt
maps/tgstation.2.0.9.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-04 22:19:03 +10:00
fc2596f3a3
Added ties. Ties that you can wear.
...
TIIIIIESSSSS
Currently there are three types, none are on the map, all are fabulous.
Lawyer suits and some others will need updating before they go in.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4611 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-03 02:27:18 +00:00
Kortgstation@gmail.com
