Commit Graph

15560 Commits

Author SHA1 Message Date
Zuhayr
8844f32385 Merge suit.dm 2014-11-16 18:15:40 +10:30
Zuhayr
c573b38d47 Working on the interface and suit hacking. 2014-11-16 18:11:15 +10:30
Chinsky
599cb247bc Merge pull request #7020 from MrSnapwalk/epsilon
Adds several custom items/cyborg sprites.
2014-11-16 10:17:25 +03:00
Chinsky
79d269c515 Merge pull request #7028 from PsiOmegaDelta/Portable
Portable Turret Fixes
2014-11-16 10:15:01 +03:00
Chinsky
8a13bfe0dd Merge pull request #7030 from PsiOmegaDelta/AirAlarm
Silent Alarms
2014-11-16 10:14:36 +03:00
Zuhayr
6526775f81 Converted Unathi breacher suits to rigs. 2014-11-16 15:28:58 +10:30
Zuhayr
b29f39b6f0 Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into spaceninjas 2014-11-16 13:43:17 +10:30
Zuhayr
823f01f4bf Changed helmet lights over to a general system/overlays. 2014-11-16 13:40:13 +10:30
Chinsky
dd7e2d4874 Merge pull request #7019 from PsiOmegaDelta/MapFix
Map Fixes
2014-11-15 22:32:36 +03:00
Chinsky
ba77ebc2c4 Merge pull request #7032 from PsiOmegaDelta/Scrubbers
Scrubber Icons
2014-11-15 21:28:02 +03:00
Zuhayr
579ebb84bb Added science rig, replaced CE rig. 2014-11-15 19:17:45 +10:30
Zuhayr
ae66fb16d3 Added jetpack, added gear, fleshed out ERT hardsuits. 2014-11-15 17:39:44 +10:30
PsiOmega
7ff2e4547b Scrubber Icons
Gives online scrubbers a slightly more appropriate icon while viewed in the map.
2014-11-14 18:48:56 +01:00
PsiOmega
9096b74f54 Silent Alarms
Attempt to fix the issue where air alarms with disabled alarm reporting still notified the monitoring consoles.
2014-11-14 15:11:27 +01:00
Zuhayr
f7cabb03c8 Reapplied ERT path changes, fixed compile error. 2014-11-14 23:09:44 +10:30
PsiOmega
255b91553b Merge remote-tracking branch 'upstream/dev' into PAP
Fixes #6844.
2014-11-14 13:33:59 +01:00
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
PsiOmega
1140a709dd Portable Turret Fixes
Constructed turrets begin offline.
(Un)wrenching turrets now take time.
If a turret has at least one controller then it cannot individually be turned on/off or set to lethal stun.
Uses the additional Topic-arg to make it possible for turret covers to call the actual turret Topic proc.
2014-11-14 13:25:57 +01:00
PsiOmega
0f620c9b56 Filled PAPs
There now exists pre-filled portable airpumps, mainly to be used by the ERT.
2014-11-14 09:26:39 +01:00
Chinsky
47b5dcfd86 Merge pull request #7016 from PsiOmegaDelta/SecRec
Relocates lasercolor snowflakes
2014-11-14 11:21:55 +03:00
Chinsky
0b8236da3b Merge pull request #7017 from PsiOmegaDelta/SafeResearch
Research Safety
2014-11-14 11:21:47 +03:00
Chinsky
69ff886235 Merge pull request #7005 from mwerezak/door
Fixes door projectile damage
2014-11-14 11:21:30 +03:00
Chinsky
2431c930d3 Merge pull request #7007 from mwerezak/helmet
Makes helmet icon south state consistent with east/west states
2014-11-14 11:19:29 +03:00
Chinsky
b45c04fdd6 Merge pull request #7009 from mwerezak/coffee
Makes vending machine coffee price in line with other items
2014-11-14 11:19:16 +03:00
Chinsky
4f81000f6d Merge pull request #7012 from mwerezak/slime-hear
Cleans up slime saycode clutter
2014-11-14 11:18:57 +03:00
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
MrSnapwalk
7c50b2a010 Adds FearTheBlackout/Devildabeast's custom item. 2014-11-13 12:35:42 -06:00
PsiOmega
c9ef7266fe Map Fixes
Corrects a merge conflict.
Makes it possible for the CE to unbolt the engine core hatches.
2014-11-13 18:18:42 +01:00
PsiOmega
c1393fb3a2 Relocates lasercolor snowflakes.
Relocates some of the laser tag assessment code into more relevant areas.
Portable turrets are no longer considered fully emagged while in lethal mode. Affects target assessment.
Fixes an issue with turret control windows not refreshing.
2014-11-13 13:11:42 +01:00
PsiOmega
7bf33f98e4 Research Safety
Research build paths are now type safe. ensuring the object type that is to be constructed always exists.
2014-11-13 12:42:08 +01: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
82090d2de2 Fixed some issues with previous commits, gave aliens and animals an attack proc, removed now-unused stungloves from attack_hand procs. 2014-11-13 21:01:55 +10:30
Zuhayr
4bb4145f5d Readded interactions for slimes and monkeys using attack_generic proc. 2014-11-13 19:18:34 +10:30
Atlantiscze
59077c5b51 Buildable robot analyzers
- Robot analyzers can now be built using Protolathe. They are low-mid level tech, requiring quite small research levels and no rare materials.
2014-11-13 08:45:45 +01:00
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
6ceac97a98 Cleans up slime saycode clutter
It was cluttering saycode used by every living mob in the game with
something that only applies to slimes.
Also, code that really applies to hearing a message shouldn't have been
mixed up with code for speaking a message.
Really awful.
2014-11-13 01:20:16 -05:00
mwerezak
b7429a76ea Adds tajaran/unathi tacticool sprite sheets
No more clipping into muzzles.
2014-11-13 01:03:29 -05:00
mwerezak
5c66480259 Makes vending machine coffee price in line with other items 2014-11-13 00:41:25 -05:00
Zuhayr
40e3ea33f6 Merge resolution. 2014-11-13 16:07:16 +10:30
Ccomp5950
701f5feba4 Merge pull request #7001 from atlantiscze/rnd-fix
Rnd fix
2014-11-12 23:28:41 -05:00
Ccomp5950
0fa7d59b46 Merge pull request #7004 from mwerezak/stance
Cleans up human stance code
2014-11-12 23:24:13 -05:00
mwerezak
fde6b6cc56 Fixes door projectile damage 2014-11-12 23:14:40 -05:00
mwerezak
f5ccbe5ba7 Cleans up human stance code
Merges leg_tally and can_stand, streamlined the stance checks in organ processing.

Removes half-implemented has_limbs (assigned to 1 but never updated anywhere).

Having only one foot now slows you down.
2014-11-12 22:56:55 -05:00
Chinsky
f2e9be6f90 Merge pull request #6973 from runedog48/master
Bugfixes
2014-11-12 23:46:19 +03:00
Chinsky
f322a6af5e Merge pull request #6992 from PsiOmegaDelta/BodyBag
Shapely body bags.
2014-11-12 23:45:36 +03:00