Commit Graph

8480 Commits

Author SHA1 Message Date
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
Chinsky
b3e2b20f91 Merge pull request #7023 from GinjaNinja32/borg_latejoin
Fix cyborg latejoining, allow mid-round joining, add robot cryo equivalent
2014-11-17 04:15:18 +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
PsiOmega
ffbbf2b858 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/ATMOSPHERICS/components/unary/heat_source.dm
2014-11-16 10:38:01 +01:00
PsiOmega
743d9be7d3 Merge remote-tracking branch 'upstream/dev' into Service 2014-11-16 10:34:42 +01:00
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
8844f32385 Merge suit.dm 2014-11-16 18:15:40 +10:30
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
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
GinjaNinja32
51020f9e84 Merge branch 'dev' into borg_latejoin 2014-11-15 21:13:04 +00:00
Chinsky
dd7e2d4874 Merge pull request #7019 from PsiOmegaDelta/MapFix
Map Fixes
2014-11-15 22:32:36 +03:00
PsiOmega
ae274de275 Security Records Check
When machinery checks security records they now only check for explicitly set arrest status.
Previously they would check for either missing security records or arrest status.
2014-11-15 20:10:53 +01:00
GinjaNinja32
bc326280c1 Merge branch 'dev' into borg_latejoin 2014-11-15 18:54:20 +00:00
PsiOmega
c7e634a8a6 Merge remote-tracking branch 'upstream/dev' into Service 2014-11-15 19:32:35 +01:00
Zuhayr
ae66fb16d3 Added jetpack, added gear, fleshed out ERT hardsuits. 2014-11-15 17:39:44 +10:30
GinjaNinja32
95f0204332 Adds robot equivalent of cryo 2014-11-14 23:39:30 +00:00
GinjaNinja32
d10311befd Adds cyborg-only latejoin spawnpoint 2014-11-14 23:38:09 +00:00
GinjaNinja32
a725526e4a Fix cyborg latejoining, allow mid-round joining 2014-11-14 23:38:08 +00: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
PsiOmega
1e29289986 Dedicated Service Server
The service radio channel now has its own dedicated message log server on the telecommunication satellite.
As a bonus the telecommunication equipment room is now symmetrical.
2014-11-14 14:18:23 +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
69ff886235 Merge pull request #7005 from mwerezak/door
Fixes door projectile damage
2014-11-14 11:21:30 +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
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
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
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
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
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
mwerezak
fde6b6cc56 Fixes door projectile damage 2014-11-12 23:14:40 -05:00
mwerezak
0bff4d7028 Merge remote-tracking branch 'upstream/master' into window-fix 2014-11-12 20:09:25 -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