Commit Graph

3901 Commits

Author SHA1 Message Date
GinjaNinja32
48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00:00
PsiOmega
dc5ab9bb64 Merge remote-tracking branch 'upstream/master' into dev 2014-11-23 12:07:45 +01:00
PsiOmegaDelta
8e50a32ba8 Merge pull request #7103 from Segrain/dev
Robotic appearances.
2014-11-23 12:05:51 +01:00
PsiOmegaDelta
6db8680406 Merge pull request #7097 from GinjaNinja32/sensors
Crew Monitoring Computer improvements, wallets working with computers
2014-11-22 22:36:40 +01:00
PsiOmegaDelta
d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00
Ccomp5950
d0383883c2 Merge pull request #7094 from Neerti/borg_hud_port_2
Semi-ports /tg/'s cyborg HUD, now with less merge conflict!
2014-11-22 03:27:10 -05: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
1c35f8825b Dummied out the AI movement code for a later project. 2014-11-22 08:04:06 +10:30
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
Segrain
7f199874fb Examining robomodules. 2014-11-21 19:28:46 +03:00
GinjaNinja32
116705b61b Fixes wallets, makes CMC use alt-titles, actually remove dead block 2014-11-21 10:42:52 +00:00
Neerti
72c9b2eb15 Resolves conflicts, cherrypicks my code. 2014-11-21 03:32:00 -05:00
PsiOmegaDelta
350273dea4 Merge pull request #7071 from Segrain/dev
Equipping custom loadout.
2014-11-21 08:03:24 +01:00
Atlantiscze
3003777b6a Adds mwerezak's suggestions
- Power monitor is now /computer/ subtype
- Different rounding of values in power monitor display
- Unfortunately, PDA power monitoring for engineers is broken and probably won't be fixed as it relies on old powernet monitoring computers. Laptops work OK
2014-11-20 16:24:26 +01:00
Atlantiscze
78a4b424ae Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-20 10:55:33 +01:00
Chinsky
af6a262a2c Merge pull request #7059 from PsiOmegaDelta/Headsets
Dynamic Headset Description
2014-11-20 02:41:08 +03:00
Segrain
77ba15aea5 Slot_tie flags. 2014-11-19 18:29:51 +03:00
Ccomp5950
088c86f692 Merge pull request #7065 from Zuhayr/combitool
Added combi-tool.
2014-11-19 08:37:15 -05:00
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +10:30
Zuhayr
660b32629e Merge resolution. 2014-11-19 23:19:33 +10:30
Zuhayr
cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
Zuhayr
0f0bca6889 Merge pull request #7038 from mwerezak/diona-scream
Fixes #7026
2014-11-19 23:11:50 +10:30
Zuhayr
c11cb65e19 Added combi-tool. 2014-11-19 23:04:09 +10:30
Atlantiscze
61990872d8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2 2014-11-19 13:15:40 +01:00
PsiOmega
45c5f01363 Dynamic Headset Description
Headsets now generate a description of available radio channels based on the installed encryption key(s).
Currently only updates on creation, not when changing encryption keys, to ensure that less than legal keys are not detected by a mere casual glance.
2014-11-18 18:43:12 +01:00
PsiOmega
f7bc35f333 Binary Tracking
The AI can again finally track entities using the binary channel.
2014-11-18 12:24:54 +01:00
mwerezak
af8da7de03 Adjusts glass sheet construction menu input 2014-11-16 22:30:07 -05:00
Chinsky
ce3618a200 Merge pull request #6987 from MagmaRam/labcoat
Reworked labcoat buttoning
2014-11-17 04:17:16 +03:00
mwerezak
9eb6dfdef4 Fixes #7026
Uploads species var from human to carbon mobs.
2014-11-16 14:43:38 -05:00
Zuhayr
cfb5710166 Added module damage to breach checks. Attempted to add relaymove/hardsuit interface procs but failed. 2014-11-17 00:12:57 +10:30
MagmaRam
cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat
Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.
2014-11-16 02:56:32 -05:00
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
GinjaNinja32
d10311befd Adds cyborg-only latejoin spawnpoint 2014-11-14 23:38:09 +00:00
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
Zuhayr
31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
Zuhayr
4bb4145f5d Readded interactions for slimes and monkeys using attack_generic proc. 2014-11-13 19:18:34 +10:30
Atlantiscze
efcfa5199b Robot analyzers can now be placed into tool belts. 2014-11-13 08:42:55 +01:00
Zuhayr
4090f04839 Readded monkey dexterity checks in each attack_hand as appropriate. 2014-11-13 17:46:37 +10:30
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
mwerezak
ab2b4608e0 Fixes #6702 and cleanup
Makes reinforced glass a subtype of glass, cleans up window creation copypasta.
Cleaned up window initialization leaking outside of the window constructor.
Removes unnecessary init_dir var from windows.
2014-11-12 20:09:04 -05:00
MagmaRam
4794898cec Fix for jobs that were spawning with the old labcoat types rather than the new ones, as well as lockers that were. 2014-11-12 18:48:47 -05:00
Chinsky
f322a6af5e Merge pull request #6992 from PsiOmegaDelta/BodyBag
Shapely body bags.
2014-11-12 23:45:36 +03:00
Chinsky
70f808a8c9 Merge pull request #6991 from PsiOmegaDelta/SafeInMyCloset
No more sleeping in closets
2014-11-12 23:44:35 +03:00
Atlantiscze
835d04290c Modifications to sensors code
- More stuff now triggers powernet warnings: People getting shocked by machinery (primarily door, but can be anything else powered by APC), and grilles. Thanks to @mwerezak for suggestion.
- Monitoring computer now has slightly different icon_state when it detects powernet warning. This is checked and updated every 5 MC ticks (ie, slightly delayed)
- Fixes ocassional runtime in powernet_sensor.dm
- Powersinks buffed a bit more. Drain rate changed from 0.6MW to 1MW. 1MW is full output of main engine SMES.
- Powersinks also dissipate small amount of internal energy charge over time. (20kW)
2014-11-12 14:54:56 +01:00