cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-01 21:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,598 Commits 74 Branches 23 Tags
92b47c94de21840b60d6b266c5d468fa911f3bd1
Commit Graph

200 Commits

Author SHA1 Message Date
Zuhayr
7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
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
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
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
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
mwerezak
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
Chinsky
e0c00bda55 Merge pull request #8973 from mwerezak/inventory2 
Inventory updates
 2015-04-26 20:13:21 +03:00
mwerezak
4829f1d82d Adds calls to mob_can_unequip() where appropriate 2015-04-25 13:55:24 -04:00
mwerezak
3a00fce32b Refactors mob_can_equip(), adds unequip checks 2015-04-25 13:54:59 -04:00
PsiOmega
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
mwerezak
1bbb19297e Implements item_state overrides for back slot, hands 
Updates backpacks to use the item_state overrides where necessary, fixes #8577
 2015-04-23 03:26:18 -04:00
mwerezak
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
PsiOmega
4b040d93ba Continues the painful process of porting Destroy()s, Dels(), and everything else needed for qdel. 2015-04-17 09:47:19 +02:00
Chinsky
65f61122b5 Merge pull request #8604 from Zuhayr/limbs 
Limb objects, severing and cybernetics
 2015-03-31 08:38:54 +03:00
mwerezak
9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2015-03-31 00:16:56 -04:00
mwerezak
c59fac2e16 Adds unloaded item state for the STS-35. 2015-03-29 02:40:57 -04:00
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00
Zuhayr
aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Zuhayr
97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
Zuhayr
a63b9b4e73 Beginning to port over new icon update from limbs branch. WIP 2015-03-24 23:48:54 +10:30
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
mwerezak
47cbfdd59e Keeps zone selection and gun mode toggle HUD elements visible when scoped 2015-02-21 16:01:47 -05:00
mwerezak
11719a380e Fixes #8151 2015-02-21 15:49:52 -05:00
PsiOmegaDelta
8e0b2a0235 Merge pull request #8139 from mwerezak/fingerprints 
Adds fingerprints whenever an item is put in a human's hands
 2015-02-16 10:35:01 +01:00
mwerezak
e5d14465b0 Adds fingerprints whenever an item is put in a human's hands. 2015-02-16 02:26:17 -05:00
mwerezak
cd81f0b706 Improves gun scope zooming 2015-02-14 22:12:16 -05:00
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
Chinsky
2f52020ce4 Fixed backwards check 2015-02-09 08:26:45 +03:00
Chinsky
5496c7bbf0 Fixes #8009 
Fixed flaslights producing infinite light/
 2015-02-09 08:05:24 +03:00
Chinsky
30de86c081 Accessories update. 
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
 2015-02-08 12:35:50 +03:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
unknown
7590bbac99 Infection chance proc improvements 
Instead of magic type bits, the infection protection value of clothing is mostly based on it's bio armor value, which is much more flexible. Also gloves and shoes to contribute to protection values, and adjusts surgical mask bio protection.
Hardsuits gain voidsuit level bio protection, when sealed.
Wearing a face mask helps prevent others from catching airborne diseases.
Also fixes #7909
 2015-01-22 11:10:57 -05:00
PsiOmega
1382df5dad Fixes #7802. 
items/examine() now properly calls and returns the result of ..().
 2015-01-14 08:24:33 +01:00
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
Loganbacca
527e83a4e3 Blood/oil stain fixes 
- Fixed item descriptions calling oil-stained items "bloody"
- Fixed mob examine describing oil-stained bare hands and feet as "bloody"
- Fixed blood overlays on shoes not updating after walking through different colored blood
- Removed some colons
 2015-01-12 01:08:28 +13:00
Zuhayr
1ea2acc24b Fixes #7392 2014-12-31 19:34:53 +10:30
Zuhayr
53627175ef Merge pull request #7347 from Baystation12/master 
Updating dev-freeze from master.
 2014-12-10 03:21:56 +10:30
Segrain
4fb83010e1 Fix for #7322. 2014-12-09 14:55:25 +03:00
Zuhayr
54ba518762 Fixes #7253 2014-12-07 18:51:20 +10:30
Zuhayr
0903bd7fc5 Working on some suit bugs, attempted to fix the welding overlay issue with no success. 2014-12-01 01:51:52 +10:30
Zuhayr
a5ee32d4ca Fixes some colour macros, removes inactive jetpack icon for rigs. 2014-11-30 23:47:34 +10:30
Zuhayr
4c1ea8cd3a Several hardsuit fixes. 2014-11-30 12:46:03 +10:30
PsiOmegaDelta
8e50a32ba8 Merge pull request #7103 from Segrain/dev 
Robotic appearances.
 2014-11-23 12:05:51 +01:00
PsiOmegaDelta
d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas 
Hardsuit/voidsuit change, ninja refactor.
 2014-11-22 09:30:54 +01:00