311dbcb0f0
Merge pull request #10658 from mwerezak/chem-fix
...
Fixes overdose not working for ingested reagents
2015-08-16 10:18:16 +02:00
7dc85cfdd4
Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates
...
Computers are now overlay based.
2015-08-16 00:40:47 +01:00
77ddae4e26
Structures now take damage properly from projectile clouds
2015-08-15 19:08:45 -04:00
eccdfd8d9a
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-08-16 05:45:16 -07:00
7e8713039a
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-08-16 05:40:47 -07:00
1186ec2af6
The stat panel now displays station time along with current round duration.
2015-08-15 22:09:18 +02:00
7241c2f2d1
Merge pull request #9947 from mwerezak/breacher
...
Makes unathi breachers fit unathi only
2015-08-15 22:04:36 +03:00
5f98346ab5
Fixes overdose not working for ingested reagents
2015-08-15 10:22:07 -04:00
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
84a9fd2927
Removed ingame capture link generation and fixed some bugs.
2015-08-15 14:04:25 +03:00
cb5df3963a
Reverts #10649 , fixes #10621
2015-08-15 13:15:52 +03:00
3b29856694
Fixes #10599
2015-08-15 13:04:57 +03:00
9ea9490332
Added map capture function.
2015-08-15 12:39:07 +03:00
4cf736bb5c
Compilation fix.
2015-08-15 11:12:43 +02:00
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
395df6d9c2
Compilation fixes.
2015-08-15 10:58:32 +02:00
cda0ecfa97
Relocates Malfunction code to appropriate location.
2015-08-15 10:52:39 +02:00
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
8b08f8ff34
Fixes explosions deleting projectiles
2015-08-15 02:51:02 -04:00
4092b40ae5
Updates frag grenades to use bresenham, tweaks
2015-08-15 02:41:32 -04:00
6404d02c38
Adds changelog and tweaks PTR penetration.
2015-08-15 02:19:23 -04:00
3b7ed9bdc4
Merge pull request #10649 from mwerezak/coffee-fix
...
Fixes #10621
2015-08-14 22:51:43 -07:00
5f5671d21f
Merge pull request #10647 from mwerezak/acids
...
Fixes #10645
2015-08-14 22:22:41 -07:00
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
4ba0a65420
Merge pull request #10648 from mwerezak/circuit-printer
...
Fixes #10637
2015-08-15 06:37:31 +03:00
a5fd2d386c
Fixes #10637
2015-08-14 23:34:24 -04:00
133bc96344
Fixes #10645
...
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
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
6ab8a11da8
Merge pull request #10646 from mwerezak/aghost
...
Aghosted mobs no longer act as SSD
2015-08-15 06:10:49 +03:00
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
88433b6b98
Merge pull request #10641 from atlantiscze/kill-all-humans
...
Newmalf Fixes
2015-08-15 03:36:35 +01:00
4257eb41fc
Get out of here stalker
2015-08-14 16:45:21 -07:00
7e8bfde893
Increases CPU income from APC hacking
...
- CPU generation from APCs is now doubled
2015-08-14 23:03:48 +02:00
20961ae9b6
Corrects wrongly displayed CPU generation.
...
- Value displayed was per decisecond, not per second. Corrected.
2015-08-14 23:00:53 +02:00
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
d05b44bec4
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette
2015-08-14 19:59:52 +03:00
617c001a62
Merge pull request #10350 from Kelenius/ofSleepersAndNano
...
Of sleepers and nano
2015-08-14 18:26:50 +03:00
d34599db55
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette
...
Conflicts:
code/game/objects/items/devices/uplink_items.dm
2015-08-14 18:24:47 +03:00
36d0eb0bcf
Cleans up id card setup. Now with less automagic and more controlled.
2015-08-14 16:08:47 +02:00
aa318b8d1c
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
code/modules/materials/material_recipes.dm
2015-08-14 16:55:21 +03:00
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
d5c6d9c341
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-14 08:43:43 +02:00
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
da58494275
Improves the way shrapnel clouds hit prone mobs
2015-08-14 00:25:41 -04:00
822d48928b
Fixes caps getting stuck in air forever.
...
Also apparently just being nodamage 0 damage non-sharp bullet is not enough to stop suicide from working -_-.
2015-08-14 06:19:35 +03:00
4fab38a7c6
Merge pull request #10622 from comma/virofixes
...
Virofixes
2015-08-13 23:16:59 -04:00
b01a41d766
Merge branch 'capgun' into russian_roulette
2015-08-14 06:03:33 +03:00
b4ec03b871
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette
2015-08-14 05:57:00 +03:00
328621b860
Moved cap guns to proper guns.
2015-08-14 05:51:29 +03:00
76b6b90299
Adds armor_penetration values to energy weapons
2015-08-13 22:38:53 -04:00
PsiOmegaDelta