Commit Graph

745 Commits

Author SHA1 Message Date
PsiOmega e11ffcdfc9 Fixes #10143.
Morgue/crematorium trays should now garbage collect properly.
2015-07-13 15:06:02 +02: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
mwerezak 87178d74a6 Adds attack animation calls for attack_generic() 2015-05-20 00:19:39 -04:00
Zuhayr 93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
PsiOmegaDelta ce8188c1a2 Merge pull request #9350 from Hubblenaut/lockers
Fixes overbloated closets
2015-05-18 19:16:59 +02:00
Hubblenaut ac1f3c3530 Fixes overbloated closets 2015-05-18 18:34:25 +02:00
Zuhayr 8ce787ef68 Final tweaks to recipe availability and material inheritance. 2015-05-17 18:22:21 +09:30
Zuhayr ed34aa2466 Rebalancing and adjusting divisors for all weapon damage values. 2015-05-17 16:51:55 +09:30
Zuhayr a540e97e1b Stool and table tweaks, adjusted tables on the map. 2015-05-17 13:41:22 +09:30
Zuhayr 4cd2a5a532 Updating stools/stool padding. 2015-05-17 12:53:23 +09:30
Zuhayr 14df1e5fb5 Converts beds, chairs and stools. 2015-05-17 03:43:59 +09:30
Zuhayr ae3ad84634 Updated ashtrays and mineral doors. 2015-05-17 03:02:03 +09:30
Zuhayr 358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr 83570a1a9e Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-16 23:35:05 +09:30
PsiOmegaDelta 65151ade35 Merge pull request #9298 from Kelenius/ofInflatablesAndDeflate
Inflatables now lose deflate verb when it's used
2015-05-16 13:51:16 +02:00
Zuhayr f4923e2a20 Renamed twohanded weapons, collapsed bats. 2015-05-16 21:12:54 +09:30
Zuhayr 8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
Zuhayr 966d797e07 Converts bat to use the material system. 2015-05-16 19:59:21 +09:30
Kelenius af14ec1855 Inflatables now lose deflate verb when it's used 2015-05-16 11:43:30 +03:00
GinjaNinja32 76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables
Conflicts:
	code/setup.dm
2015-05-16 08:53:33 +01:00
PsiOmegaDelta 38eb1ad7b9 Merge pull request #9263 from Hubblenaut/dev
Cleans up access and map artifacts
2015-05-16 09:33:11 +02:00
Hubblenaut f9cbf1a1fd Cleans up access and map artifacts 2015-05-15 15:36:48 +02:00
Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
GinjaNinja32 21394e78c4 Merge remote-tracking branch 'upstream/dev' into new_tables 2015-05-15 00:12:40 +01:00