Commit Graph

103 Commits

Author SHA1 Message Date
Zuhayr
18c2f33eab Ported ventcrawling from vg. 2016-09-21 17:16:03 +01:00
Neerti
0a389a418b Revert "Ported ventcrawling from vg." 2016-09-20 17:21:58 -04:00
Zuhayr
843c48a9ee Ported ventcrawling from vg. 2016-09-16 04:05:49 +01:00
Kelenius
1d26fcfa8e Moves a few vars where they should be
This should reduce the memory usage
2016-03-15 11:26:46 +03:00
Woodrat
7128aa72db Woodrat 9.1 "Back in Action"
- Super APC installed in Atmos
- Fixed APC, Mining Exterior APC
- Fixed Crematorium button, Installed mass driver button.
- Chapel hallway APC installed
- Gateway plugged in, console installed
- Elevator Console Installed, Bell Hop removed.
- Hazard stripes should be fixed
- Restored missing tiles (Hydro, Cafeteria Neutral, Asteroid exterior) (75% complete)
- Kitchen button restored
- Rec area bathroom lights restored
- Meat is back on the menu, two fridges with meat in the kitchen
- Unneeded wires in engineering maint removed.
- Medical substation wires fixed.
- Locker room maint APC installed
- Chapel maint APC installed
- Installed another light in robotics
- APC central maint installed
- Disposals pipe in engineering workshop fixed.
- Wire in atmos substation fixed.
2015-10-16 22:57:13 -07:00
Ravensdale
dbc13c423b Changes purple pipes to black 2015-08-17 23:45:57 -07:00
Zuhayr
3b712adb5f Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes. 2015-08-16 17:51:19 -07:00
Zuhayr
932f87faa5 Semi-fixes turf layering issues with pipes and newflooring. 2015-08-16 06:09:36 -07:00
Zuhayr
c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
Chinsky
3fd8627bd7 Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup
Refactors gas analyzation.
2015-08-13 07:23:10 +03:00
GinjaNinja32
0c1aee8074 Fixes <span class='class>, makes Travis check it 2015-07-18 21:13:32 +01:00
PsiOmegaDelta
48ee872691 Refactors gas analyize. 2015-07-02 15:32:21 +02:00
GinjaNinja32
2c49644ba4 Compile fix 2015-05-30 11:55:47 +01:00
GinjaNinja32
81d23c85cc code/ATMOSPHERICS \red \blue etc to span classes 2015-05-29 19:36:15 +01:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
Atlantiscze
12be20ed73 Mapping changes preparation
- Adds Red and Blue simple pipes for mapping use.
- Adds empty CO2 PH and N2O canisters for mapping use.
- Reworks asteroid outpost areas. Old areas kept in separate file for downstream compatibility
- Modifies engineering shuttle to work with next commit.
- SMESs no longer have to be charged above certain level (~5%?) to actually begin outputting power.
- Fixes SMES related bug caused by previous commit
2015-02-09 18:53:02 +01:00
Mloc-Argent
537b78fc80 refactor buckling to be more generic
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
 pipes and they will automatically unbuckle if the cuffs are removed.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:31 +00:00
Zuhayr
971336d223 Prevents power drain from functioning on piping (#7567) 2014-12-30 15:57:03 +10:30
mwerezak
d4a193808b Replaces awful connect type system with bitflags 2014-12-23 18:59:54 -05:00
Mloc
83f2a5ba5a fix some misplaced set_dir()s
fixes part of #7284
fixes #7288
fixes one of #7287

Signed-off-by: Mloc <colmohici@gmail.com>
2014-12-08 10:09:09 +00:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
Chinsky
4884fe2ba8 Merge pull request #6947 from mwerezak/pipe-cap
Fixes #6299, Again
2014-11-07 03:45:56 +03:00
mwerezak
fc6f3ea685 Fixes #6299 2014-11-05 00:03:39 -05:00
Ccomp5950
789906cae2 Merge pull request #6926 from mwerezak/pipe-layer
Fixes #6355
2014-11-04 02:17:41 -05:00
mwerezak
5dcda61181 Fixes #6355
Not sure why it was commented it out, but it seems to be the cause of
the layer issues.
2014-11-02 20:33:41 -05:00
mwerezak
17316f912e Fixes #6910 2014-10-31 22:22:52 -04:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
mwerezak
dec3447e20 Adjusts airlock reserve air pressures
Adjusts airlock reserve air pressures for faster cycling.
2014-09-07 23:52:21 -04:00
mwerezak
248a8057ac Adds engine waste intercooler
Also fixes pipes in space having the wrong layer set.
2014-09-07 16:51:59 -04:00
RavingManiac
1f5ee94096 Supply/scrubber upward pipes, downward pipes and pipe caps added. 2014-09-06 01:22:03 +08:00
RavingManiac
ac8562c7d9 Map altered to be NewPipe-compatible
Removed calls for non-existent files
2014-09-05 01:50:14 +08:00
RavingManiac
9801dfa9a9 NewPipe
-Supply and scrubber pipes can be run in parallel without connecting to each other
-Supply pipes will only connect to supply pipes, vents and Universal Pipe Adapters(UPAs)
-Scrubber pipes will only connect to scrubber pipes, scrubbers and UPAs
-Supply and scrubber pipes are offset along the x and y axes to prevent sprite overlap
-UPAs will connect to regular, scrubber and supply pipes, as well as anything else that connects to a regular pipe. UPAs will be used to interface between the supply/scrubber loops and atmos
2014-09-05 00:18:33 +08:00
igalan
0aa6c4f38c Fixes #6121
Moves HE pipes and junction dmi's to where the rest of the icon_manager dmi's are.
2014-09-04 05:02:03 +01:00
igalan
6bf6eaeb60 Fixes pipes duplication issues 2014-09-03 23:48:30 +01:00
mwerezak
6eb2fe3028 Device working volumes are configurable from setup 2014-08-03 22:11:45 -04:00
mwerezak
79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm
2014-07-24 16:04:41 -04:00
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
mwerezak
c46904a3b6 Merge remote-tracking branch 'upstream/dev' into power-net
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/pipes.dm
2014-07-18 15:02:07 -04:00
Loganbacca
c4abe1f5d5 Pipe cleanup
- Tidied up a couple of remaining pipes
- Removed overlapping pipes
- Removed step_x, step_y vars
2014-07-18 13:43:08 +00:00
Loganbacca
e05b5c0bfb Pipe rendering rewrite
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
2014-07-18 13:39:39 +00:00
Loganbacca
6b64fb5e77 Pipe rendering rewrite
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
2014-07-14 19:12:22 +12:00
Loganbacca
493ecdeb9e Pipe fixes
- Cleans up silent pipe deleting (now creates a loose pipe item where the pipe section was)
- Allows pipe painters to paint disconnected pipes
- Removes OOC message from IC feedback
2014-06-25 23:17:44 +12:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Ccomp5950
63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm
2014-02-20 19:16:23 -06:00
Loganbacca
e140998f86 Pipe painter bad-fix revert
Oops. Thanks Segrain.
2014-02-20 16:46:43 +13:00
Loganbacca
f451fd42c1 Pipe tweaks
- updated update_icon() for pipes and manifolds to change the color instead of the sprite
- updated subtypes to use global defines for colors instead of hard coded html refs
- added an alpha tweak to hidden pipes for the sake of mapping (DM doesn't render semi-transparent icons correctly, but it does handle var/alpha tweaks) - this is overridden when the pipe is spawned in the game world with New()
(Thinking about it, we could potentially do away with the transparent pipe sprites by just using the alpha variable. May do this later.)
- fixed pipe painter
- unwrenched pipes now inherit their source pipe color, and also inherit it when reattached to a pipe network again
2014-02-20 15:50:12 +13:00
Segrain
47cca1dde8 Fix for #4446. 2014-02-16 18:08:12 +03:00
Loganbacca
92cc536133 Pipe standardization
Cleaned up pipes.dm
Changed pipe subtypes to the following layout:
	pipe
		simple/manifold/manifold4w
			hidden
				colour
			visible
				colour

Did a complete pass of the station to standardize all pipes (yes, nearly 2500 changes)
(Haven't done the research base air and scrubber pipes yet, and atmos will be done with my engineering redesign)
2014-02-05 15:16:07 +13:00