Commit Graph

768 Commits

Author SHA1 Message Date
Zuhayr
bcca0d4aee Merge pull request #10842 from mwerezak/showers
Fixes cryogenic showers
2015-08-25 07:38:19 +09:30
Zuhayr
863d75076d Merge pull request #10759 from mwerezak/girders
Fixes reinforcing girders through windows, adds an SS13-like interface for reinforcing
2015-08-24 17:28:08 +09:30
mwerezak
286e16a0f3 Fixes cryogenic showers
Changes shower temperature settings to use more reasonable temperature values. A menu is now shown when adjusting shower temperature.
2015-08-24 00:11:40 -04:00
mwerezak
d62ff87ec9 Fixes #10689
Also some refactoring of locker stuffing.
2015-08-22 14:32:15 -04:00
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies.
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
Zuhayr
8701205783 Pariah nerfs.
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
2015-08-22 02:51:42 +09:30
mwerezak
8626fbfd39 Removes the reinforce girder verb 2015-08-20 23:50:40 -04:00
mwerezak
db7ba70415 Adds SS13-like interface for reinforcing girders 2015-08-20 23:50:16 -04:00
mwerezak
efc3121f68 Fixes reinforcing girders through windows, unbalanced span 2015-08-19 20:41:24 -04:00
mwerezak
f09b754a19 Fixes #10636 2015-08-16 15:20:59 -04:00
mwerezak
887a515483 Fixes #10659 2015-08-16 14:58:50 -04:00
Null Snapshot
0255b79114 Fixes a problem with crates containing animals not spitting out their mobs. 2015-08-14 22:47:53 -07:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix
Material stack related fixes
2015-08-08 09:56:25 +02:00
PsiOmegaDelta
8ca5d01dcf Crematorium Destroy()
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
2015-08-06 08:39:24 +02:00
mwerezak
d1bd146b1a Changes reinforced glass material name
Gives the reinforced glass material a name that is easier to verify for
correctness.
2015-08-03 23:01:34 -04:00
mwerezak
0ceb0e291d Fixes #10314
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
mwerezak
e3609bac94 Adds common proc to obtain the material of an object
Adds a common get_material() proc to objects, and implements overrides
where applicable
2015-08-01 23:03:21 -04:00
mwerezak
6df770cab3 Fixes projectiles being able to hit humans in organs they do not have.
Will also prevent body shields blocking bullets with non-existant limbs. Expands on the special return values for bullet_act(), adds defines for them.
2015-07-28 20:23:26 -04:00
PsiOmegaDelta
9b0497e01e Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-24 10:46:32 +02:00
Kelenius
d509bdbbfe Uses capitalize() 2015-07-21 11:58:39 +03:00
Kelenius
6b2daae752 Fixes #6264 - labeling janicart messes its ui
Janicart now uses nanoui and is immune to labeling screwing up its
interface
I've even resisted making pointless spacing changes this time!
2015-07-20 16:27:58 +03:00
PsiOmegaDelta
8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-07-14 08:11:11 +02:00
PsiOmega
e11ffcdfc9 Fixes #10143.
Morgue/crematorium trays should now garbage collect properly.
2015-07-13 15:06:02 +02:00
mwerezak
0fc12eb22b Fixes #9927
Fixes issues with deca code crates.
2015-07-13 00:45:36 -04:00
Zuhayr
c59dc2445c Fixes #10062 and #10061 2015-07-12 07:04:35 +09:30
PsiOmegaDelta
8fef02501c Merge pull request #9936 from mwerezak/fire
Balances fire to work better with very low concentration phoron gas burning
2015-06-26 13:34:21 +02:00
mwerezak
9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
mwerezak
aa0b23e205 Fixes #9910 2015-06-24 00:20:11 -04:00
GinjaNinja32
9c32851ba5 Merge pull request #9871 from mwerezak/extinguisher
Fire Extinguishers
2015-06-22 15:36:55 +01:00
mwerezak
6e9d73e792 Fixes #9585
Allows objects with PASSTABLE to pass over beds and chairs. Moves
chempuff passflags up to the parent water effect.
2015-06-21 00:44:38 -04:00
Zuhayr
12507e6872 Fixes #9866 2015-06-21 01:13:41 +09:30
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
mwerezak
70433b4367 Makes showers wash away touching reagents
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
2015-06-16 16:26:04 -04:00
mwerezak
dec1461f6c Fixes chair preview icon 2015-06-14 14:55:04 -04:00
GinjaNinja32
d31cf8f3d8 Merge pull request #9786 from LightningIron/dev-freeze
Welding tool bugfixes
2015-06-11 09:42:21 +01:00
unknown
c062f886c0 Attempting to weld closet with inactive welder no longer produces message claiming insufficient fuel. 2015-06-10 22:07:52 -05:00
Zuhayr
f9134028b6 Fixes #9777 2015-06-10 23:14:34 +09:30
PsiOmegaDelta
979b6adcae Removes some qdel:s of lists.
Primarily done by removing the need for clearing the contents list of bio-lockers in the first place.
2015-06-05 12:05:43 +02:00
Chinsky
10218eb8c9 Merge pull request #9573 from Zuhayr/chairs
Chair update.
2015-05-31 11:33:24 +03:00
Zuhayr
201712eb3d Added MATERIAL_PADDING flag. 2015-05-31 17:19:32 +09:30
Zuhayr
ae38961a65 Fixes #9551 2015-05-31 03:36:07 +09:30
Zuhayr
f9e99e1ee9 Fixes #9581 2015-05-31 03:34:29 +09:30
Zuhayr
deb806c4cb Fixes #9076 2015-05-30 05:24:44 +09:30
Zuhayr
3cf0018fb8 Fixing up bed icons etc. 2015-05-30 01:13:11 +09:30
Zuhayr
93aaa48cd8 Fixes #9571, various other tweaks. 2015-05-30 00:59:39 +09:30
Zuhayr
7d7723c19d Further material tweaks. 2015-05-30 00:45:58 +09:30
Zuhayr
e9f2f5cf55 Converted comfy chairs to material system, cleaned up colours/icons. 2015-05-30 00:45:36 +09:30
GinjaNinja32
3fb3a18f05 Supply shuttle and crate fixes
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
2015-05-23 16:15:04 +01:00
PsiOmegaDelta
66b8d67637 Merge pull request #9390 from mwerezak/attack-animation
Attack animations
2015-05-21 06:52:30 +02:00
mwerezak
c289975498 Adds attack animation calls for a few common machines and structures
- Cameras
- Doors
- Grilles
- Windows
2015-05-20 00:28:57 -04:00