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
mwerezak
5f98346ab5
Fixes overdose not working for ingested reagents
2015-08-15 10:22:07 -04: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
Kelenius
cb5df3963a
Reverts #10649 , fixes #10621
2015-08-15 13:15:52 +03:00
Kelenius
24fb46f1a9
Fixes #9332
2015-08-15 13:05:49 +03:00
Kelenius
3b29856694
Fixes #10599
2015-08-15 13:04:57 +03:00
Karolis2011
9ea9490332
Added map capture function.
2015-08-15 12:39:07 +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
PsiOmega
f1d481b763
Removes a magical tab.
2015-08-15 10:24:01 +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
