cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 06:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,997 Commits 8 Branches 26 Tags
af8a173e30ec1cdc2242c5fd1bafee6e159fcebc
Commit Graph

5526 Commits

Author SHA1 Message Date
mwerezak
af8a173e30 Changes IPC eyes to optics, generalizes vision organs 
Now any organ can cause vision loss if damaged, not just ones that
inherit from organ/internal/eye.
 2015-05-27 02:18:11 -04:00
mwerezak
7423f2ecfd IPC mmi_holder is now carried in the chest 
Adds an optical sensor organ (eyes) for IPCs so that losing their head
still does something to them.
 2015-05-27 01:24:34 -04:00
mwerezak
2098c80849 Damage on robot limbs no longer counts towards shock and crit 
Damage on robot limbs no longer counts towards traumatic_shock and crit.
Raises the damage mod in exchange.
 2015-05-27 01:24:00 -04:00
Chinsky
bae5bf8b4a Monkeys are scoopable again. 2015-05-26 13:44:01 +03:00
Zuhayr
0104de03d4 Allows pAIs to be scooped up and worn as hats. 
Readds missing monkey inhands
Standardized get_scooped() calls to mousedrop instead of attack_hand.
Changelog.
 2015-05-26 15:15:15 +09:30
Zuhayr
1b4b428fe9 Removed several unneeded icons from inhands, split holder icons into their own file. 2015-05-26 14:05:21 +09:30
Zuhayr
7ab8a380bd Addendum to custom synth icon commit. 2015-05-26 14:04:51 +09:30
PsiOmegaDelta
ccf5945944 Merge pull request #9362 from Kelenius/ofResearchAndPrototypes 
Updates to science
 2015-05-25 19:55:01 +02:00
Chinsky
d4eb0e82bb Merge pull request #9293 from RavingManiac/dev 
Emote, say() and visible_message() refactor, tape recorder upgrade
 2015-05-25 20:53:04 +03:00
Kelenius
ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
 2015-05-25 20:35:46 +03:00
PsiOmegaDelta
b934258adc Merge pull request #9458 from Zuhayr/ipc 
Fixes IPC lack of frailty.
 2015-05-25 09:43:20 +02:00
Zuhayr
76c3fecf9a Fixes IPC lack of frailty. 2015-05-25 17:07:04 +09:30
Zuhayr
f32a8493c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into posibrains 2015-05-25 16:50:04 +09:30
Zuhayr
88b3019e6c Adds ghost click to posibrains. 
Added ghost trap system used by plants and posibrains to get players. Added attack_ghost() to hydro trays and posibrains for the aforementioned.
Changelog.
Minor typo.
Topic fixes.
Minor fix.
 2015-05-25 16:49:22 +09:30
Zuhayr
7dd86c9147 Readded preview icon for IPC, added language and blurb. 
Added welder/fuel checks to relevant surgery.
 2015-05-25 14:50:00 +09:30
Zuhayr
f0006ec6bf Removes redundant surgery for brain and eye repair, now covered by organ repair in general. 
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
 2015-05-25 14:49:57 +09:30
Zuhayr
aa97778f0a Fixes #9433 2015-05-25 14:49:07 +09:30
Zuhayr
958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags. 
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
 2015-05-25 14:49:07 +09:30
Zuhayr
3cae318716 Merge pull request #9370 from comma/frankenstein 
Frankenstein
 2015-05-25 13:56:40 +09:30
Zuhayr
161af35d6c Merge pull request #9416 from Hubblenaut/dev 
Makes mice pick up-able
 2015-05-25 02:25:37 +09:30
Hubblenaut
7a8bbab694 fixup 2015-05-24 15:39:43 +02:00
GinjaNinja32
4bad50e875 Gives AI/borg previews back their cardborg hats 2015-05-23 20:42:51 +01:00
Zuhayr
5b8bf58d0d Merge pull request #9439 from Baystation12/dev-freeze 
Dev-freeze into dev.
 2015-05-23 21:40:26 +09:30
Zuhayr
50dd6aa0bb Merge with master. 2015-05-23 21:29:40 +09:30
Hubblenaut
7564dcf843 Fixes merge conflict 2015-05-22 21:36:48 +02:00
Kelenius
3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
 2015-05-22 19:26:39 +03:00
Hubblenaut
a7ad448293 mice are pickup-able 2015-05-22 17:59:06 +02:00
PsiOmega
15756f031b Fixes pulse-check text. 2015-05-22 14:00:42 +02:00
Chinsky
be24803309 Merge pull request #9363 from PsiOmegaDelta/PulseCheck 
Pulse check
 2015-05-22 14:35:49 +03:00
PsiOmega
43e0d9ca07 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-22 08:39:07 +02:00
PsiOmega
77099631d1 Updates del usages. 2015-05-22 08:27:12 +02:00
PsiOmega
e74c0e65bf Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/power_cells.dm
 2015-05-22 08:26:13 +02:00
PsiOmega
7d17f2eeb7 Items again have their loc set just before dropped() is called. 
Fixes #9299.
Fixes #9406.
 2015-05-21 17:55:31 +02:00
Daranz
e9d9ff57ba Remove redundant null argument in a view() call 2015-05-21 10:14:40 -04:00
RavingManiac
04293467e8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-05-22 00:04:37 +10:00
RavingManiac
839d3b0588 Ability to head blind_message when invisible people do things readded 
Tape recorder playback uses audible_message instead of visible_message
 2015-05-22 00:02:36 +10:00
Daranz
bbc8ad6383 Add extra checks for Say :i 
Say :i now leaves fingerprints on affected intercoms, and cannot be performed
at all if restrained.
 2015-05-21 09:18:02 -04:00
Daranz
b9dbeeb356 Fix a problem with Say :i not working 2015-05-21 08:53:14 -04:00
Zuhayr
52ae206174 Merge pull request #9391 from comma/ghettoMD 
Missed one baddie
 2015-05-21 18:30:06 +09:30
PsiOmegaDelta
66b8d67637 Merge pull request #9390 from mwerezak/attack-animation 
Attack animations
 2015-05-21 06:52:30 +02:00
Chinsky
cb3dea3682 Merge pull request #9369 from mwerezak/action-icons 
Ports "Makes update_action_buttons() work on-demand"
 2015-05-21 03:35:41 +03:00
Chinsky
ecc2b3c437 Merge pull request #9258 from mwerezak/charge 
Updates instances of power cell usage
 2015-05-21 03:24:20 +03:00
Chinsky
97b2a63b76 Missed one baddie 
Pretty sure that limb rotting alive is unhealthy yeah
 2015-05-21 03:22:20 +03:00
Zuhayr
c3f0f42ec2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into materials 2015-05-21 00:49:14 +09:30
Zuhayr
98def6e247 Updating dev from master. 2015-05-21 00:08:22 +09:30
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
 2015-05-20 11:50:28 +03:00
Chinsky
f42f4582c4 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into frankenstein 2015-05-20 08:52:46 +03:00
mwerezak
a1185476f8 Makes update_action_buttons() work on-demand 
Fixes #9368
 2015-05-20 01:28:16 -04:00
mwerezak
01e8246e64 Clean up world print 2015-05-20 00:35:26 -04:00
mwerezak
87178d74a6 Adds attack animation calls for attack_generic() 2015-05-20 00:19:39 -04:00