cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 01:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 9 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

705 Commits

Author SHA1 Message Date
PsiOmegaDelta
c1eba26d8a Holo-decals and fixes. 
Adds more holodeck decals.
Allows overlays to be glued unto unsimulated turfs.
Ensures holo-stools use an existing icon state.
 2015-08-16 06:09:15 -07:00
mwerezak
de6e878411 Fixes floorbots, floor attackby flooring setting, and adjusts a few flooring names. 
Made set_flooring take a flooring instance, in case calling code already
had a flooring instance it seemed wasteful to have to look up the
flooring all over again.
 2015-08-16 06:09:09 -07:00
mwerezak
ed0a089fb6 Fixes turf decal overlays layering with holopads 
Holopads layer at TURF_LAYER + 0.1 so there is the possibility that turf decals might layer over them. This ensures that decals layer under holopads.
 2015-08-16 06:08:22 -07:00
mwerezak
15599ab6c8 Mapping - minor airlock and other details 
Finishes main medical decals (adds light blue and light yellow corner
colours), adds various touch ups to mining and incinerator airlock,
science and security blast doors. Makes the science bomb test range
airless. Removes SS13 placard. Adds privacy curtains to the medical ward
and dorms.
 2015-08-16 06:08:21 -07:00
Zuhayr
1fa93c270d Various small tweaks for the flooring update. 2015-08-16 06:08:19 -07:00
PsiOmega
b55be47521 Adds dusty warning stripes. 2015-08-16 06:08:10 -07:00
PsiOmega
076a456d6f Adds additional floor icons. 
Adds additional grey and lime cornel decal icons.
Adds directional Space Station 13 icons.
 2015-08-16 06:08:01 -07:00
PsiOmega
aa475ea23c Adds (dirty) steel tiles. 2015-08-16 06:07:59 -07:00
PsiOmega
593023443f Fixes floor decal dir and layer not being respected. 2015-08-16 06:07:58 -07:00
PsiOmega
11fe86da58 More floor decals. 
Adds additional red decal icons.
Adds grey outline decal.
 2015-08-16 06:07:54 -07:00
PsiOmega
ddcc06d55f Additional floor decal icons. 
Adds grey, purple, and white floor decals.
Adds full red and yellow floors, both for floor and floor tile.
Makes the U-shaped warning sprites match the straight and L-shaped sprites.
 2015-08-16 06:07:51 -07:00
mwerezak
ca253677ef Adds more flooring decal types 2015-08-16 06:07:45 -07:00
Zuhayr
3a64ffcb09 Changes flooring to use /decl/flooring 2015-08-16 06:07:39 -07:00
Kelenius
7c1d9b5614 Mech chargers are now a single machine 
Can be built and upgraded
Resolves #5215
 2015-08-16 06:07: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
mwerezak
77ddae4e26 Structures now take damage properly from projectile clouds 2015-08-15 19:08:45 -04:00
Zuhayr
f6df7df714 Added diona gestalt preset. 2015-08-13 16:59:37 +09:30
Zuhayr
a8b801b377 Added supply beacon. 2015-08-13 16:59:18 +09:30
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
GinjaNinja32
477a9b8dba Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-13 05:55:05 +01:00
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
 2015-08-08 15:34:51 +02:00
Neerti
95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-08-03 22:13:18 -04:00
GinjaNinja32
e78715205c Walls now rotate correctly with client.dir 2015-08-02 18:05:27 +01:00
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04:00
mwerezak
e3609bac94 Adds common proc to obtain the material of an object 
Adds a common get_material() proc to objects, and implements overrides
where applicable
 2015-08-01 23:03:21 -04:00
PsiOmegaDelta
c28b3721b4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-07-31 10:00:16 +02:00
Mloc
4413356a63 fix some weirdness with wall damage overlays 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 19:17:23 +01:00
Neerti
6eece8ac45 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2 
Conflicts:
	.travis.yml
	polaris.dme
 2015-07-16 22:46:53 -04: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
2ed978b1e1 Wizards can no longer de-jaunt in turfs with dense objects. 
Also fixes an exploit where wizards could cast CentCom restricted spells by hiding inside objects, such as lockers or coffins.
 2015-07-12 14:31:26 +02:00
PsiOmegaDelta
9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
 2015-07-11 10:58:49 +02:00
Chinsky
7d9b7e10f4 Merge pull request #10038 from PsiOmegaDelta/150707-HellUniverseOptimizations 
Reduced Hell Universe Lag
 2015-07-09 20:45:51 +03:00
Mloc
ffbf547923 Merge pull request #9889 from PJB3005/bay-lights 
Lighting optimizations + NVG meson fix
 2015-07-09 14:50:10 +01:00
PsiOmegaDelta
0a4131e9dc Reduced Hell Universe Lag 
Based on https://github.com/d3athrow/vgstation13/pull/5273.
 2015-07-07 12:55:39 +02:00
PJB3005
aa30a12125 Fixes another bug 2015-07-04 17:55:41 +02:00
mwerezak
32b95445e3 Gives changeNextMove() a better name, default define 2015-06-30 22:29:45 -04:00
mwerezak
087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-06-28 22:35:14 -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
56065022a7 Updates fire_act() implementations to work better with lower temperature fires 
In some cases fire_act() wasn't even checking the applied temperature. Reworks how fire damages flooring.
 2015-06-26 00:40:55 -04:00
mwerezak
9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
Neerti
462eaa834b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync 
Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme
 2015-06-25 18:50:18 -04:00
PJB3005
c48ffa8d63 Lighting optimizations + meson fix 2015-06-23 17:46:11 +02: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
HarpyEagle
9b29ae64d9 Allows walls with matching base icons to merge 2015-06-18 20:34:49 -04: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
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
mwerezak
eb0f1fa69e Makes R-walls double plasteel 
Makes R-walls double plasteel like on master, adjusts plasteel integrity
so that R-walls have the same health as on master as well.
 2015-06-14 15:33:48 -04:00
Kelenius
0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
 2015-06-07 14:05:54 +03:00
Neerti
f43bd102f2 Makes the code compile. 2015-06-05 22:58:51 -04:00