Commit Graph

20113 Commits

Author SHA1 Message Date
Zuhayr
c72a746f20 Compile fixes. 2015-08-16 06:29:04 -07:00
Zuhayr
932f87faa5 Semi-fixes turf layering issues with pipes and newflooring. 2015-08-16 06:09:36 -07:00
PsiOmegaDelta
5846de37be Fewer decal icon states, shower curtains.
Someone had added shower curtains to the map. Creates proper definitions to avoid colors being lost on cleaning.
Floor corner decals now all utilize a white base state and simply apply a color.
2015-08-16 06:09:16 -07:00
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
49575a1e35 Blocked out the holodeck tiles. 2015-08-16 06:07:45 -07:00
Zuhayr
b43b396154 Updates instances/tiles for Centcomm. 2015-08-16 06:07:44 -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
4a0a6e7163 Fixes pipes disappearing when wrenching fails 2015-08-16 06:04:39 -07:00
volas
585ac5edca Fixes #10508 2015-08-16 06:04:39 -07:00
Kelenius
bb915a2c34 Reverts #10649, fixes #10621 2015-08-16 06:04:39 -07:00
Kelenius
9235cea379 Fixes #9332 2015-08-16 06:04:38 -07:00
Kelenius
abf2bea2f0 Fixes #10599 2015-08-16 06:04:38 -07:00
Chinsky
7241c2f2d1 Merge pull request #9947 from mwerezak/breacher
Makes unathi breachers fit unathi only
2015-08-15 22:04:36 +03:00
PsiOmega
4cf736bb5c Compilation fix. 2015-08-15 11:12:43 +02:00
PsiOmega
c81ad0964e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02:00
PsiOmega
395df6d9c2 Compilation fixes. 2015-08-15 10:58:32 +02:00
PsiOmega
cda0ecfa97 Relocates Malfunction code to appropriate location. 2015-08-15 10:52:39 +02:00
PsiOmega
3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
mwerezak
f6b9e7fb7e Merge pull request #10650 from NullSnapshot/hotfix
large crate fix
2015-08-15 02:03:39 -04:00
Snapshot
3b7ed9bdc4 Merge pull request #10649 from mwerezak/coffee-fix
Fixes #10621
2015-08-14 22:51:43 -07:00
Null Snapshot
0255b79114 Fixes a problem with crates containing animals not spitting out their mobs. 2015-08-14 22:47:53 -07:00
Snapshot
5f5671d21f Merge pull request #10647 from mwerezak/acids
Fixes #10645
2015-08-14 22:22:41 -07:00
mwerezak
3163de7a50 Fixes #10621
Coffee now adds jittery as an overdose effect. Set overdose so that drinking two full cups in one go (60 units) will result in 150 jitteriness.
2015-08-14 23:44:46 -04:00
Chinsky
4ba0a65420 Merge pull request #10648 from mwerezak/circuit-printer
Fixes #10637
2015-08-15 06:37:31 +03:00
mwerezak
a5fd2d386c Fixes #10637 2015-08-14 23:34:24 -04:00
mwerezak
133bc96344 Fixes #10645
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
Chinsky
8a21670d0b Merge pull request #10639 from GinjaNinja32/language
Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages
2015-08-15 06:11:58 +03:00
Chinsky
6ab8a11da8 Merge pull request #10646 from mwerezak/aghost
Aghosted mobs no longer act as SSD
2015-08-15 06:10:49 +03:00
mwerezak
cd153ad975 Aghosted mobs no longer act as SSD
Removed player_logged var since it didn't serve it's intended purpose and replaced with aghosted var. Changed SSD checks to only look at client since regardless of what key gets set to I think we probably don't want players being told a mob is SSD if there is some client controlling it.
2015-08-14 22:41:51 -04:00
GinjaNinja32
88433b6b98 Merge pull request #10641 from atlantiscze/kill-all-humans
Newmalf Fixes
2015-08-15 03:36:35 +01:00
GinjaNinja32
74f47de0e5 'fixes' spacestation13.com's server banner
they appear to just use the 8th field of the reply for the player count, rather than parsing the reply; this moves player count back to being the 8th entry
2015-08-15 03:18:40 +01:00
Atlantis
7e8bfde893 Increases CPU income from APC hacking
- CPU generation from APCs is now doubled
2015-08-14 23:03:48 +02:00
Atlantis
20961ae9b6 Corrects wrongly displayed CPU generation.
- Value displayed was per decisecond, not per second. Corrected.
2015-08-14 23:00:53 +02:00
Atlantis
e7adce2163 Better feedback
- Attempting to hack already hacked APC now correctly produces "You already control this APC" message.
2015-08-14 22:51:59 +02:00
GinjaNinja32
2847c08b77 Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages 2015-08-14 21:30:09 +01:00
Chinsky
f024b77697 Merge pull request #10630 from mwerezak/fix
Fixes bad ammo_magazine path
2015-08-14 19:06:33 +03:00
Chinsky
617c001a62 Merge pull request #10350 from Kelenius/ofSleepersAndNano
Of sleepers and nano
2015-08-14 18:26:50 +03:00