Commit Graph

196 Commits

Author SHA1 Message Date
Arokha Sieyes
fd8a382dfb Eris Gas Mask Sprites 2017-04-23 17:33:51 -04:00
Cerebulon
fc974f1dd9 Removed missed bit of sprite code in luchador masks. 2017-04-19 23:55:12 +01:00
Cerebulon
15cac2752b Moved spritesheet code to base mask item. Fixed captain's helmet. Cleaned up all duplicate/misnamed rig helmets. 2017-04-19 23:52:52 +01:00
Cerebulon
dd3ed474fe Added code for effected mask sprites, fixed remainder of mask sprites. 2017-04-19 04:31:25 +01:00
Anewbe
81c8570ba8 Merge pull request #2904 from Anewbe/theUnboxingBegins
Returns the Vox, who now breath Phoron
2017-01-17 23:49:14 -05:00
Anewbe
c805befca6 Breath mask action button 2017-01-16 18:14:35 -06:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
MagmaRam
8dae3942f0 Merge pull request #2719 from Anewbe/half_gas
Ports bay's half gasmak
2016-11-12 21:44:24 -06:00
Arokha Sieyes
5a5a50f7b0 Improves bandanas
No more tie verb. Just put it into whatever slot and it (correctly) adjusts the needed stuff to work. Added 'Can be worn on the head or face' to the description to indicate that.

Currently wearing a bandana on your head makes it impossible to eat, which doesn't make sense, so this fixes that too.
2016-11-11 10:51:35 -05:00
Anewbe
cc2d9d9528 Ports bay's half gasmak 2016-11-10 23:08:29 -06:00
redstryker
c8bf4cfce2 Changelog and Inventory Flags 2016-11-05 18:12:11 -04:00
redstryker
87d7d05048 Guy Fawkes Mask 2016-11-05 18:07:29 -04:00
Anewbe
b9d0cfd7b6 Display monitors will show faces again. 2016-09-26 21:25:08 -05:00
Neerti
828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
SinTwo
b4bb348e01 clothing mob sprites fix 2016-07-23 23:49:57 -04:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
redstryker
1dcad7f92d Adds the Ability to Pull Down Sterile Masks and Wear Bandanas on the Head 2016-07-04 19:31:15 -04:00
KasparoVy
d5aabda108 Ports Models for Cybernetic Limb Manufacturers + More Monitor-head Wallpapers (#1775)
* Ports Models for Cybernetic Limb Manufacturers + More Monitor-head Wallpapers

As requested!

* Modified as requested.

* Different Names
2016-05-29 15:09:56 +01:00
Arokha Sieyes
ea6754597e Ports Bay's Robolimb Changes (#1779)
* Consolidates copypasta for repairing robolimbs

Also prevents self-repairing a limb you are using to hold the tool

* Fixes robot organs becoming undamagable after reaching cap

* Fixes repairing with cable not using any cable, repairing with weldingtool not doing eyecheck

* Removes ORGAN_ROBOT and ORGAN_ASSISTED flags, fixes #13123

* Fixes damage to robotic limbs not triggering organ processing

At the same time, robotic limbs with damage don't need to process.
However, it's much safer to explicitly have robot limbs return 0 from
needs_process() instead of not rechecking bad external organs.

* Build on HarpyEagle changes to apply to Polaris

Had to apply the change from flag to an enumeration.

* Removes unneeded file

* Fix bruisepacks, remove heart

Well, the unused bay version of the heart anyway

* Tweaks examine, reverts isSynthetic

Reverted that because Bay doesn't use it the same way. Also changed Examine to not list every robo-limb on non-FBPs in red, but left them listed as normal per Spookerton
2016-05-28 14:12:19 +01:00
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Kelenius
acc78a8000 Changes types of ghosts and eyes
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Jon
9a303ea576 Fixes mask coverage. 2016-01-12 18:21:29 +00:00
Zuhayr
51deb6cd7e Made old IPC icons into a mask slot item for prosthetic heads. 2016-01-05 16:20:42 +10:30
Zuhayr
14b124a97e Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly). 2015-12-11 15:54:04 +10:30
Neerti
7571ba8c4b Think I'm done. 2015-10-11 01:16:25 -04:00
SinTwo
ec58f7c705 TG_Port
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/under/accessories/accessory.dm
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/mask.dmi
	icons/obj/clothing/hats.dmi
	polaris.dme
2015-10-11 00:58:26 -04:00
Zuhayr
a41ce0bd93 Added the Resomi. 2015-09-04 08:57:03 +09:30
mwerezak
fd8f6d9639 Removes MASK/HEADCOVERSMOUTH
Code that used to check this flag now checks body_parts_covered for FACE
instead. Added a FLEXIBLEMATERIAL item flag to continue to allow vox to
eat food without poisoning themselves.
2015-08-18 17:20:36 -04: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
70b74518a1 Moves BLOCKHAIR flags to flags_inv
Moves BLOCKHAIR and BLOCKHEADHAIR flags to flags_inv
2015-08-18 17:06:50 -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
Chinsky
89659c99fc Merge pull request #10001 from PsiOmegaDelta/150702-MaskRefactor
Refactors mask voice changes.
2015-08-13 07:23:27 +03:00
GinjaNinja32
631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta
93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/setup.dm
2015-07-30 10:49:37 +02:00
mwerezak
10df6b9403 Fixes #10363 2015-07-30 00:57:31 -04:00
PsiOmega
dc503a7e3e Refactors mask voice changes.
Being muzzled no longer prevents hivemind speech.
Masks now define their own message and verb overrides instead of being hardcoded.
2015-07-02 21:40:33 +02:00
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
PsiOmega
a78c559f6c Merge remote-tracking branch 'upstream/master' into dev 2015-04-27 08:08:39 +02:00
mwerezak
4d9586ecae Fixes balaclava sprite sheets 2015-04-25 02:55:04 -04:00
mwerezak
e50043fe99 Updates a few mask body cover flags, allows breath masks to be adjusted in hand 2015-04-24 22:00:51 -04:00
Kelenius
db30c15e4c Updates to science
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03:00
Zuhayr
0c3a18b0b6 Merge pull request #8380 from volas/sanitize_procs
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
PsiOmega
9b7834ff7a Refactors the AI eye.
Relocates eye movement to the eye code itself.
Adds a mask that allows any mob able of wearing it direct access to the camera network, as a proof of concept and adminbus.
2015-03-25 18:53:11 +01:00
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
Zuhayr
2c269e5159 More work on Heist. Remapped the Vox shuttle and added a base for it. Tweaked spawn values etc. 2015-03-21 11:13:48 +10:30
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00