cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 06:10:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,268 Commits 8 Branches 26 Tags
dcf7f308f6ea6c8d2f0cd657ffc06ba0d481fa5e
Commit Graph

1729 Commits

Author SHA1 Message Date
Yoshax
c960fad48e Changes teleportation scroll and spellbook to be only usable by wizards 2015-06-04 20:21:31 +01:00
PsiOmegaDelta
00953968dd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-04 08:20:00 +02:00
Zuhayr
9d9efc336b Merge pull request #9649 from mwerezak/fixes 
Fixes
 2015-06-03 11:45:45 +09:30
mwerezak
45d60ab551 Fixes #9640 2015-06-02 22:00:34 -04:00
GinjaNinja32
3434826eaf Merge pull request #9490 from Zuhayr/xenoruins 
Random map generator expansion.
 2015-06-02 20:59:52 +01:00
Chinsky
58d9cb24a2 Merge pull request #9632 from PsiOmegaDelta/150602-Access 
Generalizes access definitions.
 2015-06-02 22:32:11 +03:00
Zuhayr
ebe62cefd8 Refactored random map generator system and added several terrain generators. 
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
 2015-06-03 04:36:19 +09:30
PsiOmegaDelta
88b80732e7 Generalizes access definitions. 
Access description, type, and area/region (medical, security, etc.) is now defined in a datum, ensuring the id modification consoles will (should) never be missing entries.
 2015-06-02 18:11:46 +02:00
Zuhayr
dadc434f4e Ported action button system from Paradise/tg 2015-06-02 17:17:13 +09:30
PsiOmega
3d49ad3927 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi
 2015-06-01 09:07:03 +02:00
GinjaNinja32
c1cc002109 Merge pull request #9601 from Techhead0/survivalBox 
Survival box and job spawning fixes.
 2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2 Removes O2 tank and spare mask from Vox boxes. 2015-05-31 14:17:24 -04:00
Zuhayr
fd2855800f Merge pull request #9582 from mwerezak/robolimbs 
limb fixes
 2015-05-31 17:14:25 +09:30
mwerezak
d541fda7be Sets w_class for external organs 
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
 2015-05-30 19:02:37 -04:00
Zuhayr
f9e99e1ee9 Fixes #9581 2015-05-31 03:34:29 +09:30
Zuhayr
c2c8911aed Additional IPC tweaks. 2015-05-31 02:30:57 +09:30
Zuhayr
ff5c815d01 Fixes #9487 2015-05-31 01:38:04 +09:30
PsiOmega
d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
 2015-05-30 16:11:57 +02:00
Zuhayr
eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection 
Fixes #5945, de-copy-pastes parapens and sleepypens
 2015-05-30 13:57:31 +09:30
GinjaNinja32
86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens 
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
 2015-05-28 22:23:37 +01:00
Atlantis
30e4550e2e Refactor floodlights 
- Fixes #9543
- Removes ugly floodlight/proc/updateicon() and replaces it with proper floodlight/update_icon() which is standard on all objects/items. Does the same refactor for power cells and adjusts the proc call in relevant files (hence the amount of 1-line changes in various files)
- Makes floodlights properly use CELLRATE. Their load is 200 watts. Cell adjusted accordingly, it starts with 1k cell, which is enough for ~40 minutes (roughly)
- Floodlights with almost discharged cell (less than 10%) ocassionally "flicker", dimming for few seconds. This serves as indicator that the power cell is running low.
- Floodlight luminosity adjusted. They now shine slightly more, espicially closer to the floodlight.
 2015-05-28 21:45:54 +02:00
PsiOmega
62185bc0a8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-26 08:35:32 +02:00
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
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
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
mwerezak
c08774d96e Updates bear traps 
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.

Conflicts:
	baystation12.dme
 2015-05-24 16:33:41 -04:00
Zuhayr
d4e45fbee8 Merge pull request #9327 from Techhead0/chemRenames 
Replaces gaseous reagents with organic chemistry ones, adjusts flammable chemicals.
 2015-05-23 20:52:58 +09:30
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
PsiOmega
43e0d9ca07 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-22 08:39:07 +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
RavingManiac
04293467e8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-05-22 00:04:37 +10:00
Chinsky
91de5b2d9d Merge pull request #9381 from GinjaNinja32/patch-1 
Fixes #9380
 2015-05-21 03:27:28 +03:00
GinjaNinja32
aeb8f2a6c2 Fixes #9380 2015-05-20 16:44:47 +01:00
Zuhayr
71da36ec01 Updated force vars on bats. 2015-05-21 00:52:17 +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
a7d6cf3545 tyops fiexs 2015-05-20 09:49:10 +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
Zuhayr
a6f59edc22 Bit of documentation. 2015-05-20 14:00:14 +09:30
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Techhead0
aa22f7307a Replaces gaseous reagents with organic chemistry ones. 
Hydrogen, Oxygen, Nitrogen, Chlorine, and Fluorine have been replaced with Hydrazine, Acetone, Ammonia, and Hydrochloric Acid.
The new chemicals have been given appropriate effects and integrated into hydroponics.
Flammable liquids have higher touch_met so they don't take forever to build fire stacks.
Liquid phoron now contaminates clothing and burns eyes when splashed on mobs.
 2015-05-19 09:32:24 -04:00
Chinsky
05975d78b1 Adds a portable organs/lunch freezer 2015-05-19 09:33:26 +03:00
mwerezak
defc4c1f94 Adds check_charge(), checked_use() 2015-05-18 20:09:09 -04:00
mwerezak
53855d2398 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge 2015-05-18 18:47:45 -04:00
PsiOmega
e2e0ffc6e5 Compilation fixes. 2015-05-18 18:04:29 +02:00
PsiOmega
c2200109d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
 2015-05-18 17:50:48 +02:00
Zuhayr
3ed1917c3a Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. 2015-05-18 13:23:21 +09:30