98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
36c0bb0f13
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-22 01:33:09 +10:30
f89948d666
Added functionality for two-handed gun use.
2016-01-21 00:51:54 +10:30
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
4ab3daf318
Generalized w_class to obj level, defaulting to null.
2016-01-08 23:19:23 +10:30
2e89b7c718
Fixes the canUnEquip() proc.
...
It now only checks state, it doesn't change it. Fixes a number pf odd item/bag interactions.
2016-01-02 16:59:16 +01:00
f93ea6a78f
Tweaks to previous commits.
...
More tweaks to IPC fixes.
Merge resolution/compile fixes.
Further work on properly integrating, updating and fixing prosthetic options.
Repathed internal organs to organ/internal.
More work on full synthetics, changelings, overheating.
Working on getting organs to qdel properly and spawn properly when robotized.
Finalized some overheating values, added remaining prosthetic icons.
Finalizing the testing version of the full prosthetic bodies branch.
Added suit cyclers to the autolathe and map.
Fixing runtime errors.
Fixing errors.
Changelog.
Replacing limb and organ strings with constants.
Prevented brainless species from becoming full cyborgs.
Fixed issues with brain/MMIs renaming themselves inappropriately.
Various fixes and oversights.
2015-12-24 21:13:40 +10:30
d71573e749
Further work on properly integrating, updating and fixing prosthetic options.
...
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
d7eaed8c67
Span correction.
2015-12-22 10:59:33 +01:00
3cf0a0e182
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-12-22 10:46:55 +01:00
fe62634775
Stumpy hands and arms can no longer pull stuff out of bags and such.
...
Resolves #11404
2015-12-21 17:56:30 -05:00
5dbbbaa80b
Merge pull request #456 from Zuhayr/master
...
Porting forensics from Aurora.
2015-12-10 19:50:44 -05:00
9980b7ef13
Fixes onmob icons for holders
2015-12-10 19:17:13 +01:00
565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
6a22086c17
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/verbs/suicide.dm
code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
7c85f846eb
put_in_hands() refactor.
2015-12-04 17:38:58 +10:30
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
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
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
6ceffaacb5
Refactors item_attack.dm
...
Refactors and cleans up item_attack.dm and related mob attack code
2015-09-08 23:23:31 -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
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
ac738f3db4
Moves flags values to item_flags var
...
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
b80c01ffbe
Removes *COVERSEYES
...
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
2015-08-18 17:06:49 -04:00
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
64cda4aa5a
Destroyed items now use drop_from_inventory instead of unEquip. Reduces the risk of references being kept in case of held items.
2015-07-13 10:20:46 +02:00
9b4d09c974
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
fae8a6964e
Merge pull request #10082 from mwerezak/inhand-icon-update
...
Fixes #9976
2015-07-10 13:02:16 +09:30
bb0dea8991
Fixes #9976
...
Deleted items update their loc's inhand overlays if they are in a mob
when GC'd.
2015-07-09 22:55:51 -04:00
cee5f1a057
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
cdb4270f48
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-06 17:31:41 +02:00
9a6391747d
fix trays
...
Puts pikcup proc before loc is changed.
2015-07-02 13:55:27 -05:00
087a978d56
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-28 22:35:14 -04:00
6f00d831e5
Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
...
Base proc: emag_act
2015-06-21 01:18:25 +09:30
dea924541c
Emag refactoring.
...
Emags now call a dedicated emag_act proc on atoms which then returns how many charges that should be use up.
2015-06-15 15:22:32 +02:00
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
0071ed3f24
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/machinery/deployable.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/modules/mob/living/simple_animal/simple_animal.dm
code/setup.dm
2015-06-07 14:05:54 +03:00
6eea4ae7da
Merge pull request #9712 from mwerezak/all-things-to-everyone
...
Chameleon items
2015-06-07 09:01:11 +02:00
3906989eac
Mostly removes creation of throwaway objects from chameleon items
...
- Replaces the creation of throwaway items from New() with initial() calls for all chameleon items.
- Unfortunately throwaway items could not be removed when switch appearance, as initial() does not work very will with list vars.
- Makes chameleon item name cache lists global.
- Makes chameleon guns a subtype of energy guns, removes chameleon magazines.
- Moves chameleon.dm to clothing module root
- Items without icon or icon_state are no longer selectable as chameleon appearances.
- Chameleon verbs go in their own panel.
2015-06-06 18:19:23 -04:00
c77605265c
code/game/objects, code/game/machinery merge fix
2015-06-02 20:18:45 +01:00
dadc434f4e
Ported action button system from Paradise/tg
2015-06-02 17:17:13 +09:30
6d54e1c655
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/mob_grab.dm
2015-05-21 17:00:50 +03:00
165de0ad0e
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into rolling-brownouts
2015-05-12 17:19:36 +02: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
51043bc84a
Update
...
- Creates a global list of items which have pwr_drain() called every powernet tick
- Makes powersink use this list
- Adds scheck
2015-05-12 07:49:31 +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
3fa79f8d51
Removes click cooldowns almost everywhere.
...
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
2015-05-09 17:27:19 +03:00
Zuhayr