PsiOmega
52e6f96dc7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-09 17:55:14 +01:00
Ccomp5950
cab064cd16
Merge pull request #7340 from Zuhayr/dev-freeze
...
Dev-freeze fixes.
2014-12-09 11:48:33 -05:00
Zuhayr
e80f59742d
Fixes #7316
2014-12-10 00:56:26 +10:30
Loganbacca
9fce8921ac
Tape fixes
...
- All paper variants now have taped icon states (might change this to an overlay in future)
- Tape objects inherit overlays from attached papers
2014-12-09 22:53:49 +13:00
GinjaNinja32
681a6d21ea
Merge remote-tracking branch 'upstream/dev' into !
...
Conflicts:
code/modules/mob/hear_say.dm
2014-12-08 15:32:49 +00:00
Zuhayr
3c66bd3920
Merge resolution.
2014-12-08 13:01:04 +10:30
GinjaNinja32
6a975a1e6a
Noise emotes
...
Conflicts:
code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
Loganbacca
b3e0cc98cd
Implantcase cleanup
...
- Removed unnecessary icon definitions
- Cleaned up name formatting
- Removed colons
- Added variants for existing implants
2014-12-06 16:20:16 +13:00
Loganbacca
ad6828e70a
Update implantcase.dm to absolute paths
2014-12-06 16:17:07 +13:00
Loganbacca
fd53575658
Implant cases
...
- Adds freedom implant in glass case variant
- Changes implants created from protolathe to variants in glass cases
2014-12-04 20:48:45 +13:00
mwerezak
7049156519
Adds mask and oxygen tank to uplink kits that provide space suits.
2014-12-02 22:24:53 -05:00
Ccomp5950
19bbc4a004
Merge pull request #7212 from Loganbacca/ducttape
...
Duct Tape
2014-12-02 20:32:04 -05:00
Loganbacca
c5833dfb9a
Allow reading of taped paper via examine
2014-12-03 00:02:47 +13:00
Loganbacca
76d87e7c84
Tape fixes
...
- Shrunk tape roll sprite
- Disabled tearing off individual strips of tape until they have a use
- Fixed a runtime when removing tape with nothing stuck to it
2014-12-02 23:45:33 +13:00
Loganbacca
224b2f3899
Duct Tape
...
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
2014-12-02 23:17:45 +13:00
Mloc-Argent
117ca6a135
refactor 'dir = ' into 'set_dir()'
...
This should have little/no gameplay effect right now, just paving the
way for directional lights.
Replaced handle_rotation() on buckly things with this.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-01 13:44:02 +00:00
PsiOmega
e98649fa5e
Plastique wiring.
2014-11-24 11:21:31 +01:00
PsiOmega
dc5ab9bb64
Merge remote-tracking branch 'upstream/master' into dev
2014-11-23 12:07:45 +01:00
ccomp5950
eb83d5ccec
Solves a runtime when someone tries to mop up blood.
...
proc name: afterattack (/obj/item/weapon/mop/afterattack)
source file: mop.dm,45
runtime error: undefined proc or verb /obj/effect/decal/cleanable/blood/tracks/footprints/clean().
2014-11-22 03:02:40 -05:00
Zuhayr
c8e8e663f9
Merge resolution.
2014-11-22 07:31:44 +10:30
Zuhayr
c11cb65e19
Added combi-tool.
2014-11-19 23:04:09 +10:30
Zuhayr
823f01f4bf
Changed helmet lights over to a general system/overlays.
2014-11-16 13:40:13 +10:30
Zuhayr
ae66fb16d3
Added jetpack, added gear, fleshed out ERT hardsuits.
2014-11-15 17:39:44 +10:30
Zuhayr
f7cabb03c8
Reapplied ERT path changes, fixed compile error.
2014-11-14 23:09:44 +10:30
Zuhayr
4d64a11acd
Manual merge of head.dmi.
2014-11-14 23:02:16 +10:30
Zuhayr
ebbb9b36b5
Moved everything to a module-based hardsuit system.
...
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
Chinsky
43ee395c48
Merge pull request #7013 from Raptor1628/dev
...
ERT Update
2014-11-14 11:18:50 +03:00
Chinsky
1640b0a1c1
Merge pull request #7015 from Zuhayr/attackverbremoval
...
Attack proc removal/refactor.
2014-11-14 11:18:43 +03:00
Atlantiscze
efcfa5199b
Robot analyzers can now be placed into tool belts.
2014-11-13 08:42:55 +01:00
Zuhayr
90d65aed57
Removed attack_paw, attack_animal and attack_slime.
2014-11-13 17:15:29 +10:30
Raptor1628
ba12d87388
ERT Update
...
Bevy of ERT changes and updates, outlined in a forum thread here:
2014-11-13 01:28:15 -05:00
Zuhayr
b4ea25d064
Merge conflict resolution.
2014-11-10 13:00:06 +10:30
Chinsky
4230a20c45
Merge pull request #6963 from mwerezak/sliceable
...
Rewrites food slicing, energy weapons
2014-11-08 11:07:34 +03:00
mwerezak
cc82a47163
Cleans up food slicing
2014-11-07 00:10:49 -05:00
mwerezak
81f8f36874
Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.
2014-11-06 19:50:40 -05:00
Chinsky
8078ffe079
Merge pull request #6939 from PsiOmegaDelta/VerbOptimization
...
Verb optimization
2014-11-05 23:23:56 +03:00
PsiOmega
bc438e21ad
All the relevant examine changes.
2014-11-05 12:44:23 +01:00
mwerezak
a33fd1a2c6
Merge remote-tracking branch 'upstream/dev' into fire-extinguishers
2014-11-02 10:33:16 -05:00
mwerezak
97bdcca033
Fixes bad handcuff check
2014-11-01 17:02:54 -04:00
mwerezak
a9399c2b79
Custom loadout updates
...
Adds sorting to the custom gear menu list.
Adds the white cheongsam as a custom gear item.
Moves the purple comb out of the custom item defines as it is no longer
just a custom item.
Adds pockets to the bomber jacket.
Reduces the cost of ponchos to 3.
2014-11-01 15:56:11 -04:00
mwerezak
5372b526a1
Merge remote-tracking branch 'upstream/dev' into fire-extinguishers
2014-10-31 20:29:00 -04:00
mwerezak
e7dcda13de
Adds feedback when handcuffs cannot be placed, fixes robot cuffs.
2014-10-30 20:13:01 -04:00
MagmaRam
b12674c18c
Changed phrasing about pressure with full oxygen internals as suggested by mwerezak.
...
Fixed typo pointed out by Glloyd.
2014-10-29 01:49:28 -04:00
mwerezak
e549a22bba
Removes world print, re-adds react() call
...
Also removes checks for if(W.reagent) in extinguisher code, as that is
being handled separately.
2014-10-28 22:13:42 -04:00
MagmaRam
04c3cb13d3
Updated EVA and atmos manuals to match recent game changes.
2014-10-28 17:10:56 -04:00
PsiOmega
e0796caf56
Fixes #6871 . Fixes #6821 .
...
Amended to match the formatting in #6846 , to hopefully avoid merge issues.
2014-10-28 18:46:11 +01:00
mwerezak
a0b47ce4de
Water cools hot turfs even if they do not have a hotspot.
...
Also adjusts fire extinguisher volumes to correspond to the new beaker
volumes, and scales things accordingly.
2014-10-24 21:45:02 -04:00
Zuhayr
df038c9fe8
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-06 20:15:59 +10:30
Zuhayr
d0b3a3a39b
Merge pull request #6601 from Mloc/bs12-calert
...
donut boxes now update their icon to properly reflect their contents
2014-10-06 19:37:24 +10:30
Mloc
9faec14707
donut boxes now update their icon to properly reflect their contents
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-05 19:24:30 +01:00
