cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,139 Commits 8 Branches 26 Tags
ddd8fff460bedee6418092da03edf205d9a800d3
Commit Graph

3674 Commits

Author SHA1 Message Date
Arokha Sieyes
d70d85220a Adds hypo for CMO and adds vials in chem for them to use 2017-01-24 01:47:57 -05:00
Spades
9b61d10a0a Merge pull request #837 from Cameron653/master 
January Polaris Sync and various fixes
 2017-01-19 00:39:08 -05:00
Arokha Sieyes
e4b6ace4d5 Further language implant fix 
It just can't be a child of the other language implant at all.

Fixes #838
 2017-01-16 15:33:01 -05:00
killer653
832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
MagmaRam
e6ac388471 Merge pull request #2891 from Anewbe/cyber_scan 
Robolimbs no longer show up on medical's handheld scanners
 2017-01-14 14:39:18 -06:00
Arokha Sieyes
6cf76748eb Fix language/EAL implant. 
Polaris added an item with the exact same path, hence the weird behavior of the EAL implant teaching you every language. Two items with the same path = weirdness. Should be better now.
 2017-01-14 02:32:02 -05:00
Neerti
f393dafa5d Ports Bay's Journalist TV Drone 
Also ports prerequisite entertainment radio frequency code.
 2017-01-09 05:03:40 -05:00
Anewbe
60df31fc41 Merge pull request #2902 from Neerti/1/2/2017_circuit_permanent_revolution 
Permanent Revolution Circuit DLC
 2017-01-08 14:42:25 -05:00
Anewbe
8ae0c62d60 Merge pull request #2903 from Neerti/1/4/2017_flash_tweak 
Make Flashes Great Again
 2017-01-05 18:34:29 -05:00
Neerti
42807003f5 Makes halloss amount scale based on flash_strength 2017-01-05 02:30:52 -05:00
Neerti
a31e65782c Make Flashes Great Again 
Hand-held flashes now do 30 halloss per flash, if the person lacks flash protection.
Hand-held flashes now can be used 10 times per minute instead of five, due to needing ~4 flashes to down someone.
Flash rounds do 20 halloss if the mob hit lacks flash protection.
 2017-01-04 21:45:12 -05:00
Neerti
97ebf0924d Permanent Revolution Update 2017-01-04 04:41:30 -05:00
Anewbe
c9e5cded63 Robolimbs no longer show up on medical's handheld scanners 2017-01-01 23:11:08 -06:00
Anewbe
4ef3cf7ff1 Improves QoL for universal recorders 2016-12-30 21:35:44 -06:00
killer653
064485a0f8 50 sheet stacks fix 
The pathfile for fifty sheets is now /obj/fiftyspawner/glass for example

instead of glass/fifty
 2016-12-27 08:42:59 -05:00
killer653
9c359cb202 Polaris sync 2016-12-27 08:21:55 -05:00
MagmaRam
190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack 
The stack/fifty objects were really buggy, this should fix all of that in one go.
 2016-12-17 17:27:04 -06:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
MagmaRam
c5b77fcf9e Adds an implant that allows humans to speak EAL. 
It's available in the loadout for 2 points.
 2016-12-01 22:22:46 -06:00
Anewbe
050aa30eb1 Merge pull request #2817 from MagmaRam/defib_fix_please_make_this_the_last_one_please_god 
Defibs should revive people now.
 2016-11-24 13:26:03 -06:00
MagmaRam
eef853393e Defibs should revive people now. 
This might be an unnecessary fix, I might just have the worst luck.
But I couldn't get a defib to res in 10 tries before this,
got it on the second after.
 2016-11-24 00:30:05 -06:00
Anewbe
f6d311093a Merge pull request #2807 from MagmaRam/door_tape 
Tape can't be put on doors infinitely.
 2016-11-22 21:57:11 -06:00
MagmaRam
14a68d6dcd Tape can't be put on doors infinitely. 2016-11-22 21:36:05 -06:00
Anewbe
07b5b6fc1c Defibs should actually work now 2016-11-21 19:18:05 -06:00
Techhead
e679590204 Allows breaking tape with any object. 
The previous system was arbitrary, considering you can use your bare hands.
Resolves #14642
 2016-11-21 00:07:35 +00:00
Yoshax
55c0fc86a3 Fixes up and implements the experimental welding tool 2016-11-20 18:59:06 +00:00
MagmaRam
20b6d4be57 Merge pull request #2718 from Anewbe/teargas 
Adds teargas grenades, currently aspawn only
 2016-11-15 20:05:35 -06:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing 
Ports sign language
 2016-11-14 14:51:48 -06:00
Anewbe
8e5f9444f7 Fixes the autopsy scanner bugging on print 2016-11-14 14:14:25 -06:00
Arokha Sieyes
6022963815 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into defib 
# Conflicts:
#	icons/obj/device.dmi
 2016-11-12 14:55:16 -05:00
Anewbe
62c973f631 Merge pull request #2729 from Yoshax/uplinks 
Resolves mercs not spawning with an uplink
 2016-11-12 13:40:41 -06:00
Yoshax
418ea1b0ba Resolves mercs not spawning with an uplink 2016-11-12 18:13:45 +00:00
Anewbe
3a33b6221d More thing fixes 2016-11-12 12:01:44 -06:00
Anewbe
5e9b885b43 Actually fixes the stuff 2016-11-12 11:29:23 -06:00
Arokha Sieyes
f3b155b6f3 Switch << to 'to_chat' 2016-11-12 10:35:02 -05:00
Arokha Sieyes
2ea72d692f Drag to apply, reduced to 2 charges 
More balanced maybe? More like 'rounding problems' dividing 1000 by 3 and having it work right.
 2016-11-11 22:59:31 -05:00
Anewbe
d453a8dc5b Fixes the Sign over Radio bug 2016-11-11 19:58:46 -06:00
Anewbe
da90b87802 Ports Bay's tape recorders 2016-11-11 00:10:55 -06:00
Arokha Sieyes
f1eed186d3 Change to 'normal' cell 
Per staff request
 2016-11-11 00:48:46 -05:00
Arokha Sieyes
5c45086406 Change Adjacent() to get_dist() 2016-11-11 00:35:27 -05:00
Arokha Sieyes
91b61945cc Adds defibrilator kit 
Adds a defib kit. Not ported from /tg/, not a backpack or anything. It's more like an AED than anything. Click with empty hand or drag onto yourself to take the pads out, and put them into some dead person's uniform slot.

Currently has 3 attempts with 75% chance of success with the default battery.

The paddles are cabled, so if you walk away with them it yanks the cable out and you have to reconnect them. Patient can't be moving either, and it won't shock living people (someone can code an emag thing for that I guess?).

(Excludes .dme addition)
 2016-11-11 00:35:20 -05:00
Anewbe
2352001cfb Adds teargas grenades, currently aspawn only 2016-11-10 22:53:59 -06:00
MagmaRam
660b22101b Fix for health analyzers only showing multiples of 100% for health. 2016-11-06 16:55:49 -06:00
Arokha Sieyes
d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
 2016-11-04 15:42:32 -04:00
Neerti
7dadc5f6f9 Merge pull request #2658 from Anewbe/waistcoat 
Waistcoats are accessories
 2016-10-24 19:33:12 -04:00
Neerti
09030f8e8f Merge pull request #2673 from Anewbe/cuff_port 
Kills Telecuffs
 2016-10-24 19:28:44 -04:00
Yoshax
8c68671b3b Resolves an uplink issue 2016-10-24 23:11:55 +01:00
Anewbe
6d1d18a585 Kills telecuffs 2016-10-23 21:31:12 -05:00
Anewbe
b523406b27 Returns some functionality to the waistcoat, adds cham tie 2016-10-23 00:31:06 -05:00
Arokha Sieyes
92833e335c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.

# Conflicts:
#	code/datums/uplink/ammunition.dm
#	code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
#	code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
#	code/game/gamemodes/technomancer/spells/projectile/overload.dm
#	code/game/gamemodes/technomancer/spells/projectile/projectile.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/science.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/flashlight.dm
#	code/game/objects/items/weapons/power_cells.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/client/preference_setup/loadout/loadout_shoes.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/clothing/spacesuits/void/station.dm
#	code/modules/integrated_electronics/assemblies.dm
#	code/modules/integrated_electronics/input_output.dm
#	code/modules/integrated_electronics/tools.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/organs/blood.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/dnalocking.dm
#	code/modules/projectiles/effects.dm
#	code/modules/projectiles/guns/energy.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/research/designs.dm
#	html/changelogs/.all_changelog.yml
#	html/changelogs/Anewbe - Beret.yml
#	html/changelogs/Anewbe - Tape Roll.yml
#	html/changelogs/MagmaRam-PR-2631.yml
#	html/changelogs/Redstryker - EMTVoidsuits.yml
#	icons/mob/head.dmi
#	icons/mob/items/lefthand_hats.dmi
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_hats.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/skrell/helmet.dmi
#	icons/mob/species/skrell/suit.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/mob/species/tajaran/suit.dmi
#	icons/mob/species/unathi/helmet.dmi
#	icons/mob/species/unathi/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/species/seromi/hats.dmi
#	icons/obj/clothing/species/seromi/suits.dmi
#	icons/obj/clothing/species/skrell/hats.dmi
#	icons/obj/clothing/species/skrell/suits.dmi
#	icons/obj/clothing/species/tajaran/hats.dmi
#	icons/obj/clothing/species/tajaran/suits.dmi
#	icons/obj/clothing/species/unathi/hats.dmi
#	icons/obj/clothing/species/unathi/suits.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/power.dmi
#	maps/RandomZLevels/stationCollision.dm
#	maps/polaris-1.dmm
#	maps/polaris-2.dmm
 2016-10-20 21:24:07 -04:00