Commit Graph

805 Commits

Author SHA1 Message Date
Woodrat
c192378bab Woodrat Work v8.2
- Placed missing metal and glass from R&D back into R&D.
- Fixed a broken scrubber pipe on the research outpost catwalk.
- Mining and Research Outpost power issues should not be as major right off the bat. In theory should at least last half the round? Further testing needed.
- Discovery about research and mining elevators made. Filled in more asteroid turf around both, added lights to both.
- Wrong tile used in port security maintenance fixed.
- Second camera added to the AI core cause Koco is a dum dum.
- New door sprites and new door. Mixture between atmos and engieering doors, dual access. Placed on the monitoring room behind the front desk.
- Fixed Filter to phoron on the mining engineering outpost.
- Mining engineering outpost fully camera'd
- Lattice added to underneath heat exchange pipes and around the engine heat exchange pipes.
- Complete and total overhaul of the mining outpost.
- Re-removed the RCD from the industrial hardsuit.
- Blue flags created.
- One blue flag and one red flag added to the laser tag lockers.
2015-08-22 12:33:27 -07:00
Woodrat
7d65038d38 Woodrat Work 8.0 Boot Knife DLC
- Industrial Hardsuit RCD removed
- Single Action figure added to the vacant shop.
- Comfort creature added to the psych office.
- Piping underneath the holodeck control doors removed.
- Firelocks along the fore part of the central ring now glasslocks
- Air Alarms added to the cyborg station, upload foyer, messaging server room.
- Light switch, fire alarm radio, and air alarm added to secondary tool storage.
- Coffee shop shutters and door properly labeled.
- Status display added to the IA office.
- Second photo album added to the detective’s office.
- Removed forgotten items on mining z-level. I.E. I screwed up.
- Atmos backwards pumps should be fixed and sorted.
- Distro and waste lines tweaked in atmos.
- Crowbars should now be dispensed from oxy wall lockers.
- Tweaked the variables on the outpost SMES units. New SMES added to the mining engineering outpost.
- Pill cabinets added to the medbay at central.
- Mulebots should have proper access now.
- Overhaul to parts of the mining z-level. Fixed several issues brought up.
- Spoons added to the cafeteria
- One extra ERT suit for each role added to the ERT area.
- New item, combat knife. Should be robustier than the tactical knife. Available for ERT and two for the mercs.
- New item, marine boots. Basically just renamed jackboots at the moment.
- Tactical Knives and combat knives can now be put into swat boots and marine boots.  Depending on how well the feature works will be expanded to include other boots.
2015-08-17 20:47:05 -07:00
Woodrat
df92e8d1d1 Woodrat Work 7.9 - Minty Fresh Edition
- EMP box sprite added and now used for the EMP box.
- Adjusted lights in Janitorial
- 5 Earmuffs added to Engineering. 3 to atmos, 2 in the engine monitoring room.
- Dock Port broken wire fixed and pipes removed.
- Misplaced CMD camera near the park deleted.
- Fixed EVA maint door access.
- Due to popular request, laser tag lockers now have 5 sets of equipment rather than two.
- Fixed some holodeck designs
- Slimes added to xenobio
- Random gas sensors in space near the research outpost fixed.
- CE door access fixed.
- Changed Northern Star issue tag to mint green.
- Mining z-level overhaul, mining engineering outpost given its own area. Standardized wire colors, overhauled engineering outpost on the mining z-level, added substations to each outpost.
- Empty jar added to the RD office
- Beepsky removed until I can figure out how he beeps.
- AI and status displays added to the pool.
- Random shovel now in science/cargo maintenance.
- Fire alarms and other equipment added to the coffee shop.
- Fire alarm, radio, fire extinguisher, light switches, shutters, and a button added to the IA office.
- Furniture changes to the metal chair and comfy chair.
2015-08-12 21:47:49 -07:00
Mark9013100
65089c44b7 Adds a box for fingerprint cards 2015-08-09 11:36:57 -04:00
Neerti
f407f9aa22 Merge pull request #137 from Woodratt/Woodrat_Work_7.8
Woodrat Work 7.8 "Tiny mini skirt edition"
2015-08-09 02:29:38 -04:00
Woodrat
b8c0c5ca5d Woodrat Work 7.8 "Tiny mini skirt edition"
- Added jumpskirts to their department lockers.
- Fixed minor code issue with the QM skirt
- Single scientist wardrobe added to research rest room
- Removed robust cola machine from gateway, added laptop vendor in its stead.
- Two universal recorders added to the main map. Captain's office and art storage.
- Adjusted and added cameras to the doc area to improve coverage.
- Adjusted cameras in primary hallway leading to the dock for coverage purposes.
- Added newscaster to central park.
- Finalized work on the large dorms/visitor housing.
- Added CM sprite for frag grenades for our grenades, also lessened the size of the explosion to (-1,-1,3) from (-1, -1, 4) in a vain attempt to make the blast radius smaller. They shouldn't be too much weaker but...
- Sprite for a box of frag grenades added, box of 7 frag grenades also added to code.
- Two merc op TTVs removed, one left behind. One box of frags and 6 blocks of c4 added to merc op shuttle in their stead.
- One box of frag grenades added to ERT armory.
2015-08-08 23:18:39 -07:00
Mark9013100
1b014ef703 Minor ERT/Central changes 2015-08-08 14:21:00 -04:00
Mark9013100
b601310f9b Men in black 2015-08-08 06:01:35 -04:00
Neerti
cc61b81171 Merge pull request #132 from Woodratt/Woodrat_Work_V7.7
Woodrat Work v7.7
2015-08-08 00:56:06 -04:00
Woodrat
ff9ddf3bfe Woodrat Work v7.7
- Glass Sheets in robotics increased to two 50 sheet stacks.
- Removed accidentally added tile next to medical.
- Engineering Solar cameras now properly named and on proper networks.
- Dock Hallway cameras added, Bridge entrance cameras updated with proper network.
- Fixed broken access on Nanomed Plus vendors and medical closets.
- Single fire extinguisher added to patient ward hallway
- Work on the dock finalized, no other major changes to be done, glass firelocks installed.
- Cafeteria work finalized. Glass firelocks added, Kitchen now properly access locked.
- Air alarm added to security checkpoint.
- Two emergency flood lights added to engineering storage.
- Single camera added to EVA, may change out with two others.
- Redundant and unnetworked cameras removed.
- Hydroponics fore door switched to dual chef/gardener access.
- Guess pass terminal added to the bridge hallway.
- Bar layout finalized, glass firelocks added.
2015-08-07 21:49:23 -07:00
Neerti
d911badae8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge
Conflicts:
	.travis.yml
	polaris.dme
2015-08-07 20:25:57 -04:00
Neerti
efb531d1eb Merge pull request #128 from Neerti/8/4/2015_asteriod_floor_fix
Fixes being unable to build floors on asteroid turf.
2015-08-07 20:23:10 -04:00
PsiOmegaDelta
a6d9002806 Merge pull request #10442 from Baystation12/dev-freeze
Dev freeze
2015-08-07 10:37:47 +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
Neerti
72a3a878c0 Fixes being unable to build floors on asteroid turf. 2015-08-04 21:49:22 -04:00
Mark9013100
6309d30a3a Fixes #83 2015-08-04 06:37:37 -04:00
PsiOmegaDelta
4d57f5ef66 Uses raised TM symbol in the mirror name.
Now uses the HTML code for the trademark symbol.
2015-08-04 10:41:28 +02:00
Neerti
fd2d6c5ea8 Merge pull request #106 from Woodratt/Woodrat_Work_v7
Woodrat Work v7 Bugbash
2015-08-04 01:34:22 -04:00
Woodrat
a2886198e1 Woodrat Work v7 Bugbash
- Engineering Monitoring Room door access fixed.
- More signs installed, including cargo. Woodrat should no longer get lost in his own museum.
- Missing buttons in the engine room readded.
- Security request console moved upon request.
- Security voidsuit added to the armory.
- Best Doctor 2552 plaque, in the way of air alarm fixed.
- Research dock hallway airlock access fixed.
- Doubled the amount of charge in the main SMES.
- Robotics should now have glass, metal, and plasteel materials.
- Light and camera fixed in the AI chamber.
- Removed Area Air Control scrubber from RD's office as it is now pointless.
- Added AAC to toxins storage out on the outpost.
- Windoor access in engineering foyer fixed.
- Added tiny change to engine (plz no threads/bans). Manifold with endcap on waste line for potential cooler.
- Guest pass comp. added to medical, buttons fixed for door. Windoor medical access added.
- Missing Dock 1 firelock added.
- Meducal HUD added to the CMO Office.
- Transfer shuttle, fixed (again). Notify me if it doesn't work.
- Size complaints addressed. Of the map you pervs.
2015-08-03 22:25:52 -07:00
PsiOmegaDelta
93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/setup.dm
2015-07-30 10:49:37 +02: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
f3c9a7224b Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/reagents/reagent_containers/borghydro.dm
2015-07-24 10:53:57 +02: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
GinjaNinja32
0c1aee8074 Fixes <span class='class>, makes Travis check it 2015-07-18 21:13:32 +01:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
2015-07-14 08:21:12 +02: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
PsiOmegaDelta
c6f4f7fcee Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-12 15:14:43 +02:00
Zuhayr
c59dc2445c Fixes #10062 and #10061 2015-07-12 07:04:35 +09:30
mwerezak
c7ff5eebe3 Updates hats to use item_state_slots where necessary. 2015-06-27 23:33:33 -04:00
PsiOmega
f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
2015-06-26 20:28:47 +02:00
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
PsiOmega
8843aa2402 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/alarm.dm
	html/changelogs/.all_changelog.yml
2015-06-24 18:15:28 +02:00
mwerezak
aa0b23e205 Fixes #9910 2015-06-24 00:20:11 -04:00
PsiOmegaDelta
9698def0e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/nano/modules/human_appearance.dm
2015-06-22 16:59:19 +02: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
PsiOmegaDelta
405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
2015-06-20 20:40:06 +02:00
GinjaNinja32
82aa88c777 Merge pull request #9862 from Zuhayr/dev
Fixes
2015-06-20 17:27:26 +01:00
Zuhayr
6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
Base proc: emag_act
2015-06-21 01:18:25 +09:30
Zuhayr
12507e6872 Fixes #9866 2015-06-21 01:13:41 +09:30
Zuhayr
9f9a5cc49e Fixes #9843 2015-06-20 21:37:41 +09:30
PsiOmegaDelta
1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
PsiOmegaDelta
772488fadc Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/setup.dm
	maps/exodus-1.dmm
	maps/exodus-5.dmm
2015-06-17 09:33:34 +02: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