DJSnapshot
abd3551754
headmin requested updates to adminhelps. Makes players select between three different types of help to narrow down what players are needing help for. That way mentors get only those relating to needing mentor help.
2014-11-17 01:30:21 -08:00
mwerezak
3a83a31440
Merge remote-tracking branch 'upstream/dev' into sliceable
...
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm - caused by whitespace :/
2014-11-16 22:25:50 -05:00
mwerezak
2e222523e1
Fixes inverted slicing check
2014-11-16 22:13:17 -05:00
mwerezak
72c6de26a4
Adjusts damaged stance system
2014-11-16 22:12:20 -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
MrSnapwalk
3efbebec14
Adds the new spacesuit sprites. Adds a less IMMULSION-BREAKING description for the syndicate spacesuit/helmet.
2014-11-16 19:05:09 -06:00
mwerezak
9eb6dfdef4
Fixes #7026
...
Uploads species var from human to carbon mobs.
2014-11-16 14:43:38 -05:00
Amunak
07b050435f
fixes redundant information for a custom beaker description
2014-11-16 20:34:12 +01:00
Amunak
4a845beb7d
corrects volume shown in description of beakers
2014-11-16 20:33:25 +01: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
f850b2616d
Fixes the light power consumption the new /tg/ style.
2014-11-16 11:13:27 +01:00
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
MagmaRam
4c5ae21aab
Fixed typo that broke everything
...
Haste makes waste and breaks everything. At least this time it was less
broken than last time.
2014-11-16 03:31:22 -05:00
MagmaRam
d01e14eb58
Revert "Revert "Changed defining of icon_open and icon_closed as requested""
...
This reverts commit 046c92419e .
2014-11-16 03:24:39 -05:00
MagmaRam
046c92419e
Revert "Changed defining of icon_open and icon_closed as requested"
...
This reverts commit 8d34ffe397 .
2014-11-16 03:24:33 -05: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
17670a5698
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spaceninjas
2014-11-16 18:18:46 +10:30
Zuhayr
b9a52a6c35
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-11-16 18:17:31 +10:30
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
d0d2a100bd
Merge pull request #7018 from GinjaNinja32/robot_move
...
Fixes cyborg movement depending on actuators when not caused by cyborg
2014-11-16 10:17:31 +03:00
Chinsky
599cb247bc
Merge pull request #7020 from MrSnapwalk/epsilon
...
Adds several custom items/cyborg sprites.
2014-11-16 10:17:25 +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
MagmaRam
8d34ffe397
Changed defining of icon_open and icon_closed as requested
2014-11-15 14:36:10 -05:00
GinjaNinja32
bc326280c1
Merge branch 'dev' into borg_latejoin
2014-11-15 18:54:20 +00: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
Menshin
cd1487f1fa
Rewrote maploader to act faster and better handle set variables.
...
Most notably :
* better loading times, less processing loops
* lists variables are now taken into account (simples and associatives)
* every character can now be used inside a string without fear of breaking the loading process
2014-11-15 01:33:13 +01: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
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
Chinsky
0b8236da3b
Merge pull request #7017 from PsiOmegaDelta/SafeResearch
...
Research Safety
2014-11-14 11:21:47 +03:00
Chinsky
7261bcbd05
Merge pull request #6975 from Ccomp5950/restrict_ai_ert_shuttle
...
AI's no longer able to use specop's shuttle console.
2014-11-14 11:20:29 +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
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
PsiOmega
60a730b5d6
Automatic solar tracking again functional.
2014-11-14 08:12:39 +01:00
MrSnapwalk
7c50b2a010
Adds FearTheBlackout/Devildabeast's custom item.
2014-11-13 12:35:42 -06:00
GinjaNinja32
5811122619
Fixes robot movement caused by non-self using power
2014-11-13 14:52:13 +00: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