cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,936 Commits 7 Branches 0 Tags
ada2ba9a2fa872bea16ef2d6f86e90b0fd3ec7a5
Commit Graph

6530 Commits

Author SHA1 Message Date
Chinsky
ada2ba9a2f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color 
Conflicts:
	code/modules/power/cable.dm
	icons/obj/power_cond_red.dmi
 2014-01-27 02:27:27 +04:00
Zuhayr
84b3512261 Merge pull request #4345 from RKF45/misc 
Fixes for my earliest commits
 2014-01-26 09:16:07 -08:00
Ccomp5950
dfec09ebb2 Merge pull request #4342 from Zuhayr/ihategit 
Multiz changes.
 2014-01-25 20:24:49 -08:00
RKF45
4ca429fdf3 Actually allowing tiny objects on ears 2014-01-25 13:06:22 +01:00
Zuhayr
5709dc2629 Fixes so ladders actually connect and function now. 2014-01-25 04:16:18 +10:30
Zuhayr
e870d614c2 Mass correction of controler to controller. 2014-01-25 03:15:13 +10:30
Mark Aherne (Faerdan)
ae4d35e354 NanoUI Gas Cooling/Heating System 
* Created Nano UIs for the Gas Cooling System and Gas Heating System
* Standardized the reference structure for procs (they now use use full paths, instead of relative)
* Standardized the names of each machine ("gas cooling system" and "had heating system") for both the object and the UI title
 2014-01-24 00:38:26 +00:00
Ccomp5950
283df26fa7 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-23 00:19:01 -06:00
Ccomp5950
c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2014-01-23 00:05:53 -06:00
Chinsky
3b26dab954 Merge pull request #4309 from LBraindead/dev 
AMEN
 2014-01-19 21:25:19 -08:00
Chinsky
5a8eb3c455 Merge pull request #4318 from Loganbacca/engineroom 
Engine Room Redesign
 2014-01-19 21:22:45 -08:00
Zuhayr
0ad12c7e72 Merge pull request #4313 from RKF45/small 
Small
 2014-01-19 18:58:33 -08:00
Loganbacca
24c6063a07 Updated Supermatter user manual sprite 2014-01-20 01:57:58 +13:00
Loganbacca
0f4068724b Pod door tweaks 
- Added directional pod door sprites
- Made pod doors change draw layer when they open and close
   - Pod doors draw behind the glass layer when open
   - Pod doors draw in front of the glass layer when closed
 2014-01-20 01:57:57 +13:00
Loganbacca
0ede7ed9cb Engineering area tweaks 
- Added a few Engineering areas, and moved one from the Rust files
- Made the "Engineering Storage" area overlay sprite transparent
 2014-01-20 01:57:57 +13:00
LordBraindead
d5eb58d8d6 generalized the z-level atmospipes 2014-01-19 12:00:22 +01:00
Chinsky
669ae9a1ae Made cables use color var instead of separate icons for each color. 
It allows for wires of ANY color (just set cable_coil var)
and most importantly
40 837 958 b - before
39 506 651 b - after
 2014-01-19 03:02:58 +04:00
RKF45
5649bb7fe2 Various tiny improvements 2014-01-18 22:15:46 +01:00
LBraindead
bbe01a80e6 Update explosion.dm 
transfer explosions accross z-levels
 2014-01-18 00:33:41 +01:00
LBraindead
8592fdb953 Update pipe_dispenser.dm 
dispensing new pipes
 2014-01-18 00:30:06 +01:00
LBraindead
f653216cde Update construction.dm 
dispensing new pipes
 2014-01-18 00:29:18 +01:00
LBraindead
ca2de46bc8 Update turf.dm 
preventing space being made and immediately changed to open space
 2014-01-18 00:28:20 +01:00
LBraindead
9d618b2a11 Update lattice.dm 
allow lattices to exist on open space
 2014-01-18 00:16:14 +01:00
Kani0824
7a7fc7e1ea Removed book that causes braindeadness 
Choosing a certain religion name and/or deity causes player to start out with 100 brain loss.  Removed that.
 2014-01-17 18:06:30 -05:00
Furlucis
7dd5968f76 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-17 03:05:04 -05:00
Furlucis
88181a8057 Tweaks homunculi 
Makes them a bit creepier, and makes it so they don't spawn with
underwear. Because really, if the rune spawns anything, it should be
robes. But that would make things too easy.
 2014-01-17 03:00:32 -05:00
Ccomp5950
8a179a8ff1 Merge pull request #4299 from Faerdan/dev 
Canister, Tank & Tank Transfer Value NanoUIs.
 2014-01-15 15:21:47 -08:00
Ccomp5950
775d75d2f4 Merge pull request #4301 from Loganbacca/bayfix-master 
Multiple typo and bug fixes
 2014-01-15 14:04:10 -08:00
Ccomp5950
dd7fef9dc2 Merge pull request #4277 from RKF45/paint 
BS12 posters
 2014-01-15 14:02:47 -08:00
RKF45
30f2d49f01 Quotes inside strings confuse and scare me. 2014-01-15 22:45:10 +01:00
Loganbacca
682dfd5670 More typo fixes 
Missed these in the last commit.
 2014-01-15 20:03:12 +13:00
Loganbacca
c83537a6a9 Sink filling typo 
No more filling the the bucket using the sink.
 2014-01-15 19:13:06 +13:00
Loganbacca
e145b61681 Refined earlier fix 
Tried a couple of other solutions, but this ended up being the most reliable.

Now checks all areas associated with the firedoor to see if they should still be down.

Also makes a final check before closing the door in case the fire alarm turns off in the middle of an autoclose cycle.
 2014-01-15 18:18:58 +13:00
Mark Aherne (Faerdan)
024a0baa49 Canister, Tank & Tank Transfer Value NanoUIs. 
* Added Canister, Tank & Tank Transfer Value NanoUIs.
 2014-01-15 01:08:45 +00:00
Loganbacca
4953608bda Previous fix code cleanup 
Fixes #4295

Todo: investigate sub-areas not inheriting var/fire
 2014-01-14 18:47:29 +13:00
Loganbacca
c55e71c739 Fixes #4295 
Issue: firedoor not correctly entering alarmed state.

Todo: cleanup fix before PR
 2014-01-14 15:53:24 +13:00
RKF45
5083e1cd47 Requested adjustments 2014-01-13 22:54:47 +01:00
RKF45
0a4a7c7c08 Merge remote-tracking branch 'upstream/dev' into paintmixing 2014-01-13 22:15:33 +01:00
Ccomp5950
d5bcef4f8a Uplink fix item spawner fix. 
Probably a merge conflict fix or something but some code got moved to an odd spot.
 2014-01-12 22:37:00 -06:00
Mloc
e826458900 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-01-12 21:55:11 +00:00
Mloc
c46d872e6c Merge remote-tracking branch 'upstream/master' into dev 2014-01-12 19:46:31 +00:00
Mloc-Argent
0215410e02 Fix for assistants being unspawnable after one enters a cryopod. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-12 13:54:32 +00:00
RKF45
b9c747aeaf Makes mixing paints actually make sense 2014-01-12 12:04:18 +01:00
Chinsky
1d6c645bc9 Merge pull request #4279 from Ccomp5950/pda_optimizations 
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
 2014-01-11 18:48:55 -08:00
Ccomp5950
83ef93c41c Merge pull request #4270 from Baystation12/master 
Merge master into Dev
 2014-01-11 18:18:03 -08:00
Rob Nelson
56e4b11ec5 Dynamic loading of posters 
* Add dynamic loading of poster designs (untick group in DM to remove, no more toggles)
* Fixes wirecutters duping posters
* Fixes dropped posters not being placeable.
 2014-01-11 18:10:31 -08:00
Ccomp5950
167671d583 NanoUI PDA optimizations no more sortAtom every tick on every PDA. 
Should be noticably better on large population servers.
 2014-01-11 20:09:11 -06:00
Rob Nelson
2e903710b0 Merge branch 'paint' of https://github.com/RKF45/Baystation12 into paint 2014-01-11 17:58:28 -08:00
RKF45
9e0391af04 Adds Baystation 12-specific posters 2014-01-12 01:42:41 +01:00
RKF45
fabfceaa5a Fixed forever! 2014-01-11 22:50:22 +01:00