868413c880
Polaris Sync October 9th ( #633 )
2016-10-09 18:55:29 -04:00
7192bf08fd
item_state cleanup
2016-07-11 22:31:32 -04:00
244fb40de8
Fixes part 1
2016-06-20 23:32:18 -04:00
32e9c4a34b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoUI
...
Conflicts:
code/game/machinery/adv_med.dm
2016-06-20 11:51:25 -04:00
1e2136781c
Adds NanoUI for multiple computers.
2016-06-20 11:48:52 -04:00
cd9fdd228b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
beda3185eb
Reverts the second mob clean up because of incomplete implementation.
...
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
11c5b10bb9
Refactors various item attack() implementations
...
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
Conflicts:
code/game/objects/items/weapons/clown_items.dm
code/game/objects/items/weapons/material/kitchen.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:57:22 -04:00
df5a0d7941
Mob inventory cleanup
...
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
07881e7495
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
27feb09a31
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer/computer.dm
html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
38c6ba3a07
Code relocation.
2015-10-11 17:31:21 +02:00
070ca0adea
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/holodeck/HolodeckControl.dm
code/modules/mob/living/carbon/breathe.dm
code/modules/mob/living/carbon/human/life.dm
code/setup.dm
2015-10-11 17:17:41 +02:00
fd3370c01f
Fixes #11263 .
...
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263 .
2015-10-10 10:11:48 +02:00
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
068d02c28c
Refactors various item attack() implementations
...
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
2015-09-08 23:39:33 -04:00
db8aefb121
Refactors duplicate parry code
2015-08-28 14:39:28 -04:00
df3eeb891e
Fixes dead people blocking stuff with shields.
2015-08-26 11:51:04 -04:00
fb6b94de87
Incorporates laser reflection into the shield system
2015-08-26 10:39:54 -04:00
0a751322e3
Rewrites shield handling
...
Rewrites shield handling to be less hardcoded.
Shields now take into account the damage source and direction when blocking.
Riot shields no longer block most bullets, but are better at blocking melee and thrown items than they were previously.
Energy shields block projectiles with a similar probability as they did before, and block melee and thrown as well as riot shields do.
Shields no longer block from directly behind the player.
Weapons now only block melee attacks.
Cool effects when blocking with an energy shield or energy sword (including holoswords).
2015-08-26 10:39:31 -04:00
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
b2e9a7c2a6
Merge pull request #9942 from RavingManiac/dev
...
Sound environment revamp
2015-08-20 19:47:09 +03:00
2cb46e035c
Removes unused obj flags and fixes overlapping flags
...
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
2015-08-18 17:08:41 -04:00
23e9c7d4c9
Merge
2015-08-16 17:10:11 -07:00
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
49575a1e35
Blocked out the holodeck tiles.
2015-08-16 06:07:45 -07:00
b43b396154
Updates instances/tiles for Centcomm.
2015-08-16 06:07:44 -07:00
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
7dc85cfdd4
Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates
...
Computers are now overlay based.
2015-08-16 00:40:47 +01:00
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
3cb6b1ca79
Holodeck stool icon fix.
...
Backports the icon state change from dev. Fixes #10515 .
2015-08-12 08:33:57 +02:00
03578d4ea3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-06 08:12:38 +02:00
cf1ffd273a
Fixes holodeck runtime.
...
initial() doesn't work well with lists. Causes a null value.
2015-08-05 09:33:34 +02:00
87d4cf4f68
Computers are now overlay based.
...
Computers now use an overlay based system, instead of demanding a full set of icons (on, off, broken) for every different computer.
Partially ports ParadiseSS13/Paradise#1468 which is a port of tgstation/-tg-station#9931 .
2015-07-07 17:23:49 +02:00
d1cc0517ce
Sound environment changes. Different values for hallways, carpeted rooms, maintenance tunnels, etc. Holodeck sound environment changes with the loaded program
...
In low-pressure or space, sounds will be heard in sound environment 22 (underwater))
2015-06-27 03:47:37 +10:00
cc7c502fb8
Updates emag attackby usages to emag_act where it's not too much of a headache.
2015-06-16 09:34:13 +02:00
a07d20d657
Ports /tg/'s meteor implementation.
...
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
4b87799072
New tables, code section. Changelog entry soon.
2015-05-13 19:08:39 +01:00
b52cf35680
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/projectiles/projectile.dm
2015-05-12 13:40:47 +02:00
569e785014
Holodeck items no longer spam admin attack logs.
...
/obj/items now has no_attack_log variable if set to 1, it won't log.
All holodeck items and lasertag weapons have no_attack_log set.
<3 Mangled
2015-05-11 22:11:46 -04:00
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
549270c73c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
...
Conflicts:
code/game/machinery/washing_machine.dm
code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
946373f8a0
Merge pull request #8975 from PsiOmegaDelta/Thunderdome
...
Custom ambiance music for holodeck programs.
2015-04-26 20:05:58 +03:00
d7bbc6f1c3
Makes it possible to define custom ambiance music for holodeck programs.
...
Cleans up holodeck code. Revives an old SS13 track, THUNDERDOME!
2015-04-25 10:53:14 +02:00
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
5b037670b3
Removes most instances of item_color
...
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
2015-04-22 17:40:27 -04:00
01ce8d4a1f
Fixes #8696
...
Fixes #8696 , and updates other usages of drop_item() where appropriate.
2015-03-31 20:30:06 -04:00
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
Eearslya Sleiarion