cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-10 17:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,047 Commits 74 Branches 23 Tags
7fffed2e4ef8d466e882a90bcd8a2401bbbb231d
Commit Graph

240 Commits

Author SHA1 Message Date
Hubblenaut
a89c066905 Fixes onmob icons for holders 
Conflicts:
	code/game/objects/items.dm
 2016-01-08 14:47:08 +01:00
RavingManiac
6e82dfa381 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-04 19:25:36 +08:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis 
Qdel() tweaking and a bonus
 2016-01-01 23:58:29 -05:00
PsiOmegaDelta
96cbc225ff Bags with the auto-pickup ability can no longer grab anchored objects. 
Also fixes the canUnEquip() proc. It now only checks state, it doesn't change it. Fixes #11819 and probably a couple other odd item interactions.
 2015-12-30 11:28:54 +01:00
PsiOmegaDelta
a95927d653 Merge pull request #11728 from Baystation12/dev-freeze 
Dev
 2015-12-22 12:08:45 +01:00
PsiOmegaDelta
d7eaed8c67 Span correction. 2015-12-22 10:59:33 +01:00
PsiOmegaDelta
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
ccomp5950
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
PsiOmegaDelta
1a8fc50f1e Removes suicide code. 2015-12-14 15:57:56 +01:00
PsiOmegaDelta
b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev. 
Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml
 2015-12-06 11:48:20 +01:00
PsiOmegaDelta
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
Zuhayr
7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
Zuhayr
0aa0f49033 Generalized w_class to obj level, defaulting to null. 2015-12-01 21:23:11 +10:30
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
RavingManiac
b405c575cf Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-11-19 14:45:30 +08:00
Zuhayr
1244c4a5fd Porting forensics from Aurora. 2015-10-24 02:15:06 +10:30
mwerezak
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
Kelenius
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
mwerezak
af52b475ff Fixes missing cooldowns, missing cult blade sound. 2015-09-09 15:15:43 -04:00
mwerezak
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
mwerezak
fb6b94de87 Incorporates laser reflection into the shield system 2015-08-26 10:39:54 -04:00
mwerezak
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
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
mwerezak
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
mwerezak
b80c01ffbe Removes *COVERSEYES 
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
 2015-08-18 17:06:49 -04:00
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
PsiOmegaDelta
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
PsiOmega
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
RavingManiac
145b627464 Storage system altered to be storage space based 2015-07-12 22:25:43 +08:00
PsiOmegaDelta
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
Zuhayr
fae8a6964e Merge pull request #10082 from mwerezak/inhand-icon-update 
Fixes #9976
 2015-07-10 13:02:16 +09:30
mwerezak
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
PsiOmega
cee5f1a057 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items.dm
 2015-07-06 18:33:09 +02:00
PsiOmega
cdb4270f48 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-06 17:31:41 +02:00
Kearel
9a6391747d fix trays 
Puts pikcup proc before loc is changed.
 2015-07-02 13:55:27 -05:00
mwerezak
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
Zuhayr
6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct 
Base proc: emag_act
 2015-06-21 01:18:25 +09:30
PsiOmegaDelta
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
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
Kelenius
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
PsiOmegaDelta
6eea4ae7da Merge pull request #9712 from mwerezak/all-things-to-everyone 
Chameleon items
 2015-06-07 09:01:11 +02:00
mwerezak
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
GinjaNinja32
c77605265c code/game/objects, code/game/machinery merge fix 2015-06-02 20:18:45 +01:00
Zuhayr
dadc434f4e Ported action button system from Paradise/tg 2015-06-02 17:17:13 +09:30
Kelenius
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
Atlantiscze
165de0ad0e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into rolling-brownouts 2015-05-12 17:19:36 +02:00
PsiOmega
b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/projectiles/projectile.dm
 2015-05-12 13:40:47 +02:00
Atlantiscze
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
ccomp5950
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
Kelenius
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