Commit Graph

47 Commits

Author SHA1 Message Date
ZomgPonies b2e821ebb0 Fixes fancy uniform 2015-06-18 16:24:04 -04:00
ZomgPonies 9a6ac0e44a Adds in new fancy uniform for events 2015-06-15 11:05:06 -04:00
Fox-McCloud 0a4ea0b326 LINDA--Updated Gas Datums and Atmospheric Defines 2015-05-18 20:10:30 -04:00
Fox-McCloud 6be72f97b8 forgot 2015-04-30 23:11:42 -04:00
Fox-McCloud 2b406e7d63 ACJ Buff 2015-04-30 21:53:05 -04:00
SamCroswell 8829a90709 NT Rep + Blueshield Uniform Change 2015-03-08 16:59:01 -04:00
Markolie 4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
Markolie f7426c8d72 Add bandanas, mask toggling, camo armor jacket and bugfixes 2015-02-28 17:09:45 +01:00
ZomgPonies 8714512403 Superhero Part 2: Owlman vs. The Griffin! 2015-02-24 20:13:00 -05:00
DZD 4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
Fox-McCloud 0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie 09321d6c0b Use station_name proc where possible, mapfix 2015-01-21 23:37:05 +01:00
Fox-McCloud 159bf0f56c Flashbang-Headsets 2015-01-13 16:33:49 -05:00
Fox-McCloud ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud a92921786f Clothing Update 2015-01-01 11:23:48 -05:00
Markolie b8282b7cae Blueshield/NT Rep/NT Rec updates 2014-12-10 06:09:06 +01:00
Markolie bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Markolie 7554748a26 Adds Mortician, vomit mask fix, fix for missing images for various jobs 2014-11-26 20:44:06 +01:00
Markolie 3be1a2553e Bug fixes, wording changes 2014-11-25 22:56:12 +01:00
Markolie 42dd08ff7d Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation 2014-11-22 02:24:21 +01:00
Bram961 1e8681cc11 Pirate outfit
A new outfit looking like the one a pirate captain would wear
2014-10-24 17:16:42 +02:00
Bone White 2edff42431 Wubbledaddy's Pennywise costume fix 2014-09-08 04:46:58 +01:00
Necaladun 2f3caa9b0c Pennywise items, disposal fix 2014-09-03 09:44:45 +09:30
ZomgPonies f1d8804a16 WTF vg, next thing you know you'll be burning down the library. 2014-07-25 18:27:38 -04:00
Heredth 4328993913 Added nazi uniforms.
Conflicts:
	code/modules/clothing/under/miscellaneous.dm
2014-07-25 18:12:12 -04:00
Necaladun 22f4f9004f Donator fluff item
Flagbearer's rebel outfit.
2014-06-11 15:52:01 +09:30
Erthilo 288385ba66 Adds vox fitted uniforms and shoes to all jobs excluding sec, mime, and clown.
Conflicts:
	code/modules/clothing/under/color.dm
	code/modules/clothing/under/jobs/civilian.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox_w_uniform.dmi
2014-05-13 21:57:50 -04:00
Necaladun 38b92bde0e Vox jumpsuits
Ripped vox jumpsuits for pancakeflipper
2014-05-13 03:34:46 +09:30
Necaladun 3e3fc0f314 Wisewill Sprites
Added wisewills sprites - bane stuff, sec rig fixes
2014-04-15 00:29:51 +09:30
ZomgPonies 04542065e5 Tons of new Mafia-theme stuff 2013-12-29 14:30:29 -05:00
ZomgPonies 77778e7ea5 Add maid uniform 2013-12-28 08:48:07 -05:00
ZomgPonies 02d24dfc6b Roman Armor 2013-10-27 00:06:22 -04:00
ZomgPonies 640e38ce23 Massive code fix to get the codebase ready to compile in BYOND 500 2013-09-15 23:58:16 -04:00
Zuhayr 8b518f5639 Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental. 2013-06-08 19:20:02 -07:00
MisterBook 06b7700086 Cobpipe fix
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
2013-05-31 00:09:00 -05:00
fauxtada e384c90093 minor changes
- Fixed accesses to security office doors.
- Added a second HoP closet for attire purposes. Armor and guns in one closet - fancy clothes in the second one.
- Fixed Writerer's custom item thing. Was attached to wrong character.
2013-04-30 02:37:43 -07:00
fauxtada 3fa1314c01 Fancy Formal Wear Overhaul
- Adds female dress unforms to Captains, RD, and HoP's closets.
- Fixes up the bride's dresses so they are working when spawned.
- Fixed Wedding Branch. - five wedding dresses.
- Added Dress Branch. - twelve dresses - that's including dresses moved over from the wedding branch.
2013-04-17 22:03:38 -07:00
SkyMarshal 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
Cael_Aislinn 825a7dcbf9 various mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-09 22:49:38 +10:00
Cael_Aislinn 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
d_h2005@yahoo.com 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
Cael_Aislinn 78435b0ba6 re-add wedding stuff. haven't tested them ingame
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-28 20:51:31 +10:00
baloh.matevz 530c5c804a - Yet another issue that needed fixing resulted in the entire system having to be rewritten. Fixes issue 44, Fixes issue 690.
New defines in setup.dm:

This revision changes the following things:
- Hot is no longer defined as 'higher temperature than 310.15K' but is defined as 'higher temperature than my body temperature'. The opposite applies for cold.
- Removed heat_transfer_coefficient and protective_temperature
- Added heat_protection and cold_protection flag variables to obj/item, which define which areas of your body are protected from heat.
- Added max_heat_protection_temperature and min_cold_protection_temperature which define up to which temperature the item protects when worn (NOTE that it only protects on the locations specified by the heat_protection flags!) and down to which temperature it protects from the cold.
- REMEMBER! hot and cold were redefined to mean 'which way your body temperature should be moving based on the air around you'.
- Each tick, your body now 'corrects' your body temperature towards 310.15K which is the ideal temperature. The correction is max( difference/12, 10 ), so either a twelfth of the difference between your body temperature and 310.15K, or 10K, whichever is higher. This ensures your body temperature stabilizes over time.
- Most notable changes in the amount of protection you get from common items are these: Space suits now ONLY protect from cold and fire suits now ONLY protect from heat. Now what this means is obviously that firesuits will be useless in space, but also that if you find yourself in a fire with a high body temperature and you put a firesuit on, your temperature will no longer stagnate at the high temperature, due to temperature not going up nor down, but rather it will get lower. Instead it will be protected from rising, it will however gradually get lowered by your body's 'auto-correct' attempts, as described in the last point. Additionally, if you wear a fire suit and enter an area with a good temperature (for isntance 290K) and you have a high body temperature, due to just escaping from a fire, the fire suit will not make your body temperature stagnate. Because it does not protect you from cold, and cold being defined as 'colder than your body temperature', you will actually successfully cool down to the optimal temperature.
- The opposite applies to space suits. They protect from cold and don't protect from heat. If you find yourself in space and your temperature drops and put on the space suit with your temperature still low, you will recover over time. If you enter an area with a good temperature, you will recover faster, since the space suit does not protect you from heat.
- In short, space suits are now better at dealing with space and fire suits are better at dealing with fires.
- You will NEED a fire helmet to be protected from heat and you will NEED a space suit helmet to be protected from cold. There is no 'but'. Fire helmets are red or white hardhats, found in all fire closets.
- The 'heat up' coefficients are defined in setup.dm, they are:
- - head = 30%
- - lower and upper torso = 15% each = 30%
- - legs and arms = 7.5% each = 30%
- - feet and hands = 2.5% each = 10%
- Gloves cover hands
- Shoes cover feet
- Space-worthy jumpsuits cover legs, arms, upper and lower torso
- Space suits cover legs, arms, hands, feet, upper and lower torso
- Headgear covers heads
- Removed the HEADSPACE and SUITSPACE flags, due to being moved to the new variables. This frees up the flag value 4.
. The amount of damage heated gas and heated areas do can now be set in human/life.dm. The values are: (The different levels are based on breath temperature or body temperature.)

#define HEAT_DAMAGE_LEVEL_1 2
#define HEAT_DAMAGE_LEVEL_2 4
#define HEAT_DAMAGE_LEVEL_3 8

#define COLD_DAMAGE_LEVEL_1 1
#define COLD_DAMAGE_LEVEL_2 2
#define COLD_DAMAGE_LEVEL_3 4

//Note that gas heat damage is only applied once every FOUR ticks.
#define HEAT_GAS_DAMAGE_LEVEL_1 2
#define HEAT_GAS_DAMAGE_LEVEL_2 4
#define HEAT_GAS_DAMAGE_LEVEL_3 8

#define COLD_GAS_DAMAGE_LEVEL_1 1
#define COLD_GAS_DAMAGE_LEVEL_2 2
#define COLD_GAS_DAMAGE_LEVEL_3 4

The speed at which your body temperature raises or falls can be altered with the following defines: 

#define BODYTEMP_AUTORECOVERY_DIVISOR 12 
#define BODYTEMP_AUTORECOVERY_MINIMUM 10
#define BODYTEMP_COLD_DIVISOR 6
#define BODYTEMP_HEAT_DIVISOR 6

The divisors determins by how big a difference between your body temperature and the surrounding air (or 310.15 in the case of autorecovery) will your body temperature change. The autorecovery_minimum means what the minimum recovery is, if difference / 12 is less than 10, it will recover by 10.


Was all this needed to fix Issue 44? Yes..... yes... it was... Some things are consequences of decisions made while fixing it, but all of it was necessary to completely fix the issue. I found it did not remain on the tracker for this long for nothing.

I'm sorry for the essay, but there was a lot of work involved and a lot of changes happened, so I had to write a lot...

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4428 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-16 02:48:49 +00:00
baloh.matevz 55f405f98b - Went through all the clothing stuff and only gave the ONESIZEFITSALL flag to the clothing items that actually have a fat sprite. Fixes issue 393
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4418 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-15 14:25:54 +00:00
johnsonmt88@gmail.com e9671308bf Reorganized clothing as a whole.
Everything related to clothing should now be defined in modules/clothing. I'm almost certain there's clothing code hidden elsewhere but this should be the vast majority of it finished.

Everything is set up related to the object types themselves (meaning paths.)
So all hats will be in modules/clothing/head, all gloves will be in modules/clothing/gloves, ect...

I've removed 'modules/clothing/random.dm' and 'objects/items/clothing.dm' which both seemed to just be a place where people would put stuff they were too lazy to find a proper home for.

I've also moved files that had no, or very few blocks of code into more catagorized areas.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4388 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-13 02:17:14 +00:00
mport2004@gmail.com c86c8e1505 Finished moving the clothes in defines over to modules.
Several head objects path changed so they are not helmets, head means can fit on your head, helmet was securities helmets, space helmets currently still helmet.
Cult restricted job list now has the sec force + cap because you can’t convert them as is.
AI removed from protected traitor jobs as malf is currently effectively out of commission.
A Protected list was added to changling.
Removed the furry mob files that were not checked.
Moved two unchecked files to unused


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3896 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 19:25:01 +00:00