Commit Graph

20392 Commits

Author SHA1 Message Date
mwerezak
524548cc95 Fixes #10680 2015-08-16 14:58:27 -04:00
PsiOmega
4d826e68cb Mob bump fixes.
ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365. Fixes #10682.
2015-08-16 20:55:02 +02:00
Hubblenaut
d2e2574f07 Merge remote-tracking branch 'upstream/dev' into dev 2015-08-16 20:39:50 +02:00
SomeoneElse
9b547608f6 [minor] Fix research design item path definition, usage of TECH_* macros
code/modules/research/designs.dm:
	fixed path definition of `datum/design/circuit/shield`
	fixed req_tech variable to now use TECH_* macros
2015-08-17 00:25:37 +06:00
mwerezak
b21bd0c42d Ports fix for #10660 from vg
Courtesy of PJB3005
2015-08-16 14:24:44 -04:00
GinjaNinja32
f0c9f16099 Merge pull request #10677 from PsiOmegaDelta/150816-SynthSay
Synth say fixes.
2015-08-16 14:55:04 +01:00
GinjaNinja32
0fe3c6e926 Merge pull request #10678 from PsiOmegaDelta/150816-PrivateSay
Makes the private AI channel truly private.
2015-08-16 14:53:38 +01:00
PsiOmega
21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00
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
PsiOmega
0b01482eb6 Synth say fixes.
Adds synth message sanitizing. Fixes #10667.
Makes sure say() code at least to some degree returns expected values. Fixes #10675.
2015-08-16 14:00:29 +02:00
Zuhayr
0c2d0852ae Merge pull request #10666 from PsiOmegaDelta/150815-RoundDuration
Round Duration display
2015-08-16 03:40:23 -07:00
PsiOmega
13076b6f55 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-16 10:32:06 +02:00
PsiOmegaDelta
7b5b7162d0 Merge pull request #10673 from Baystation12/master
Dev-freeze
2015-08-16 10:30:13 +02:00
PsiOmegaDelta
311dbcb0f0 Merge pull request #10658 from mwerezak/chem-fix
Fixes overdose not working for ingested reagents
2015-08-16 10:18:16 +02:00
GinjaNinja32
7dc85cfdd4 Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates
Computers are now overlay based.
2015-08-16 00:40:47 +01:00
mwerezak
176e4232ca Fixes #9155
Heaters and freezers now check if there are other machines in their turf that have the same connection dirs.
2015-08-15 18:28:09 -04:00
Zuhayr
eccdfd8d9a Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-16 05:45:16 -07:00
Zuhayr
7e8713039a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-16 05:40:47 -07:00
PsiOmega
1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
mwerezak
4b21f5f8ad Fixes pipes disappearing when wrenching fails 2015-08-15 15:46:52 -04: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
b879db05b4 Makes the fake crew record creation utilize all the new id fields. 2015-08-15 17:03:19 +02:00
mwerezak
5f98346ab5 Fixes overdose not working for ingested reagents 2015-08-15 10:22:07 -04:00
PsiOmega
c51e208094 One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686. 2015-08-15 15:22:37 +02:00
Karolis2011
84a9fd2927 Removed ingame capture link generation and fixed some bugs. 2015-08-15 14:04:25 +03:00
volas
982ec2df21 Fixes #10508 2015-08-15 14:01:19 +03:00