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
Kelenius
aa318b8d1c
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
code/modules/materials/material_recipes.dm
2015-08-14 16:55:21 +03:00
Kelenius
18358936ee
Merge branch 'dev' into ofSleepersAndNano
...
Conflicts:
maps/exodus-1.dmm
maps/exodus-2.dmm
maps/exodus-5.dmm
2015-08-14 16:50:44 +03:00
mwerezak
6566d88e88
Fixes bad ammo_magazine path
2015-08-14 03:48:01 -04:00
PsiOmegaDelta
02b6021277
Compilation fixes.
...
It's apparently 10mm now.
2015-08-14 08:51:06 +02:00
PsiOmegaDelta
d5c6d9c341
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-14 08:43:43 +02:00
PsiOmegaDelta
3a55b130a0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
.travis.yml
code/modules/virus2/disease2.dm
maps/exodus-5.dmm
2015-08-14 08:34:42 +02:00
mwerezak
4fab38a7c6
Merge pull request #10622 from comma/virofixes
...
Virofixes
2015-08-13 23:16:59 -04:00
Chinsky
0056a889de
Moved antibodies to the rest of reagents.
...
Updates them to use new chem processing.
Also axes unused commented out code.
2015-08-14 04:53:46 +03:00
Chinsky
38adf2c5b4
Fixes #10294
...
Now if virus can infect lesser/greater form of specie, it can infect its counterpart.
Also made viruses affect only joinable species to lessen a chance of spawning a virus that they can't work on (e.g. slime-affecting viruses that can't be injected into monkeys). As a side-effect viro reports are a little less inane listing all the species crewmembers aren't supposed to know about like xenomorphs and Shadows.
2015-08-14 04:20:44 +03:00
Chinsky
54cb084113
Merge pull request #9997 from PsiOmegaDelta/150702-MoneyMoneyMoney
...
Economic strength now depends on race and job.
2015-08-14 03:56:57 +03:00
Chinsky
8c9d36e24a
Merge pull request #10197 from GinjaNinja32/gender
...
Changes gender-based words to use a datum list instead of switches.
2015-08-14 03:56:18 +03:00
Chinsky
94f0ceffe1
Merge pull request #10200 from mwerezak/gun-desc
...
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03:00
Chinsky
701515ae88
Merge pull request #10202 from mwerezak/20150713-molotov-cocktail
...
Rag and drink bottle improvements
2015-08-14 03:55:35 +03:00
Chinsky
c664ca6096
Merge pull request #10276 from mwerezak/uplink-items
...
Allows traitors the option of purchasing the C-20r or STS-35
2015-08-14 03:55:03 +03:00
Chinsky
c5d54ba454
Merge pull request #10455 from mwerezak/t-scanner
...
Adds client image based t-scanner
2015-08-14 01:39:36 +03:00
mwerezak
34bcc3143a
Fixes bad span
2015-08-13 18:37:18 -04:00
mwerezak
7dcd599a37
Allows bedsheets to be cut up into rags
2015-08-13 18:37:18 -04:00
mwerezak
e0965bc2cb
Implements inserting rags into booze bottles
2015-08-13 18:37:17 -04:00
mwerezak
b003e2f94c
Lowers the volume of eggs to 10
2015-08-13 18:37:15 -04:00
