Commit Graph

3205 Commits

Author SHA1 Message Date
Chinsky
7f1c93290f Merge pull request #8414 from mwerezak/misc
Atmos space vent fix
2015-03-09 22:13:06 +03:00
mwerezak
721bdac904 Fixes atmos space vent pump
Fixes atmos space vent pump not being on and shifts it closer so that it is visible from inside atmos.
2015-03-09 11:41:27 -04:00
Zuhayr
b43aa4b2b4 Merge pull request #8409 from mwerezak/misc
Tweaks for Z8, armour vests, merc blood packs
2015-03-10 00:51:52 +10:30
mwerezak
d37b5a896f Gives the mercs two bloodpacks, which they seem to have been missing due to an oversight 2015-03-09 03:43:56 -04:00
mwerezak
4c7138db14 Adds four mercenary vests to the merc base, tweaks 2015-03-09 03:15:45 -04:00
PsiOmega
27d5b0d3df Xenoflora piping issues.
Fixes an issue where the yellow siphon line was merging with the hydrophonic tray piping/connectors, unintentionally.
Also makes sure that the related space vent is actually powered.
2015-03-08 21:50:55 +01:00
PsiOmega
173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm
2015-03-05 08:05:44 +01:00
Raptor1628
cf0e526d91 Fixes and adjustments
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
2015-03-04 11:18:40 -05:00
PsiOmega
fb09009016 Fixes #8348.
Relocates blob start to adjacent turf, allowing it to act upon (and destroy) the previously weapon blocking emergency shutter.
2015-03-04 09:53:15 +01:00
PsiOmega
cf11fad8bc Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-01 21:13:38 +01:00
PsiOmega
00becda446 Few Fixes.
Fixes #8304.
Fixes #8306.
2015-02-28 14:29:30 +01:00
Zuhayr
bceb01c233 Merge pull request #8290 from mwerezak/gun-rewrite
Fixes captain's laser gun
2015-02-26 16:28:43 +10:30
mwerezak
ec59f8ab07 Fixes captain's laser gun
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
2015-02-25 23:35:20 -05:00
PsiOmega
c61a60c064 Map fixes.
Fixes one of the holodeck issues mentioned in #8267. Was unable to reproduce the failure to load the basketball simulation.
Fixes a problem in the vault where the a crate of gold had been replaced with a vault door instead.
2015-02-25 19:22:45 +01:00
Snapshot
600f55bdca Merge pull request #8252 from Raptor1628/dev-freeze
Assorted Fixes
2015-02-24 17:08:33 -08:00
Raptor1628
d4870b80ee Assorted Fixes
Rebalances the random armory so there are always energy weapons,
projectile weapons, and ion weapons. Ammo no longer random. Fixes some
oversights with the EMT area and improves flow. Sec Guns fit in belts.
Fixes typos and a missing price in the vending machine.
2015-02-24 14:40:02 -05:00
GinjaNinja32
86243b97fd Fixes shuttles. Yes, all of them. 2015-02-24 19:15:16 +00:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
Chinsky
b5dda2b793 Merge pull request #8180 from mwerezak/mercenary
Map updates and fixes, plus hardsuit icons
2015-02-23 15:27:35 +03:00
mwerezak
575c41a6b0 Fixes the map again
Somehow a single line path change became 582 additions and deletions.
2015-02-22 21:23:28 -05:00
mwerezak
3ae3ef7961 Merge remote-tracking branch 'upstream/dev' into runtime 2015-02-22 21:13:20 -05:00
mwerezak
6c4d16774f Merge remote-tracking branch 'upstream/dev' into mercenary
Conflicts:
	code/game/objects/items/devices/uplinks.dm
2015-02-22 20:44:43 -05:00
mwerezak
5be4a2f0e4 Merge remote-tracking branch 'upstream/dev' into mercenary 2015-02-21 13:22:51 -05:00
mwerezak
fffae6fb77 Merge remote-tracking branch 'upstream/dev' into mapping 2015-02-21 13:18:10 -05:00
Zuhayr
14f8e3beac Numerous kitchen changes in tandem with prior commit. Removed processor. 2015-02-21 22:24:01 +10:30
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
Chinsky
214324eaaf Merge pull request #8156 from PsiOmegaDelta/CameraMove
Custom ninja spawn points.
2015-02-21 11:43:19 +03:00
mwerezak
6aba01a5c6 Fixes merc base area, adds 1 module-less hardsuit to the merc base 2015-02-20 20:41:36 -05:00
mwerezak
b1fad50e78 Fixes xenoflora piping, allows virology pipenet to connect to the scrubber line
Also adds a freezer and heater in the xenoflora storage room to help
xenobotanists create atmospheres for plants.
2015-02-20 20:32:34 -05:00
mwerezak
d44381a010 Moves air alarm 2015-02-20 03:54:16 -05:00
mwerezak
26356806c5 Merge remote-tracking branch 'upstream/dev' into mapping 2015-02-20 03:05:04 -05:00
mwerezak
9269139a05 Updates holodeck mapping 2015-02-20 01:52:10 -05:00
mwerezak
9c9bf136e2 Adds a gas meter to the mercenary shuttle airlock air reserve 2015-02-20 01:24:33 -05:00
mwerezak
bdbd649aca Fixes space vent pumps, adds chapel air sensor
Fixes bad pressure_check var on external vent pumps to space that was
preventing them from working, adds an airlock sensor to the chapel mass
driver to indicate when it is safe again, and adds a t-valve connection
between the special xenobio/flora scrubber pipenet and the main scrubber
line.
2015-02-20 01:11:30 -05:00
mwerezak
ce5bb2fa60 Adds a suit cycler and a pair of sts-35s to the mercenary gear storage area 2015-02-20 00:27:28 -05:00
Raptor1628
2ae273e1b8 Gear again
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.

http://baystation12.net/forums/viewtopic.php?f=5&t=12064

http://baystation12.net/forums/viewtopic.php?f=5&t=12031

http://baystation12.net/forums/viewtopic.php?f=5&t=12027

http://baystation12.net/forums/viewtopic.php?f=5&t=12007
2015-02-18 15:35:37 -05:00
PsiOmega
958391d06b Custom ninja spawn points.
The ninja should no longer risk spawning far away from the station, with no clue where to go to reach it.
2015-02-18 08:14:40 +01:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Zuhayr
ae1161184c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-18 14:17:39 +10:30
mwerezak
daeaf08080 Merge remote-tracking branch 'upstream/dev' into mapping 2015-02-17 02:21:53 -05:00
mwerezak
2d7fd6e5f1 Adjusts holodeck, fixes #8153 2015-02-17 02:14:51 -05:00
mwerezak
159e86050c Fix map divergence from dev 2015-02-16 23:48:21 -05:00
Zuhayr
f41e955ada Merge pull request #8142 from PsiOmegaDelta/MapMap
Map Changes
2015-02-17 11:50:38 +10:30
Zuhayr
4631e53718 Merge pull request #8140 from comma/undies
Underwear closet, crossdressing
2015-02-17 03:03:45 +10:30
PsiOmega
60a64b5216 Additional map changes.
Removes substation cameras in conjuction with #8143.
Replaces near-vacuum warning plates with more station friendly versions.
2015-02-16 14:01:14 +01:00
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
PsiOmega
12077ebeee Map Changes
* Removes a few cameras in storage areas.
* Bolted vault doors now have a proper instance.
* Updates a few access issues noted during testing as well as fixes #7925.
* Restores baystation12.int.
2015-02-16 10:33:32 +01:00
Chinsky
f9ba327c3a Merge pull request #8099 from mwerezak/gun-rewrite
Gun rewrite
2015-02-16 11:54:52 +03:00
Chinsky
400f717424 Maps undies wardrobes into dorms and ERT spawn point 2015-02-16 11:24:50 +03:00
mwerezak
69284990a3 Merge remote-tracking branch 'upstream/dev' into runtime
Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
2015-02-15 22:24:36 -05:00