cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 14:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,830 Commits 8 Branches 26 Tags
2c234591c8d8a7059bcd35d00f63e39ecdc2fcbc
Commit Graph

7256 Commits

Author SHA1 Message Date
Anewbe
89b8a66a44 Merge pull request #2749 from Yoshax/braindeath 
Being unable to breathe and having oxyloss now causes brain damage that scales with your oxyloss
 2016-11-16 17:16:33 -06:00
Anewbe
cdef74bcdc Lightning spells and bioelectrogenesis will no longer stun outright 2016-11-15 21:49:06 -06:00
Anewbe
35b80e8eae Fixes bears 2016-11-15 20:23:01 -06:00
Yoshax
4885482d2b Moves the brain into the same place as the other organ files 2016-11-15 21:55:01 +00:00
Yoshax
bff720aede Being unable to breathe and having oxyloss now causes brain damage that scales with your oxyloss 2016-11-15 21:54:43 +00:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing 
Ports sign language
 2016-11-14 14:51:48 -06:00
Anewbe
aa93f8436e Projectiles now log for autopsy reports 2016-11-14 14:14:10 -06:00
MagmaRam
7f2e507140 Merge pull request #2721 from Anewbe/taperecorder 
Ports Bay's tape recorders
 2016-11-12 13:32:29 -06:00
Anewbe
5e9b885b43 Actually fixes the stuff 2016-11-12 11:29:23 -06:00
Anewbe
b8018065bc Ports sign language 2016-11-11 15:43:03 -06:00
Anewbe
da90b87802 Ports Bay's tape recorders 2016-11-11 00:10:55 -06:00
MagmaRam
bff4e6a4e1 Makes clothing actually hide stuff, fixes a couple odd related bugs. 2016-11-10 18:00:31 -06:00
MagmaRam
b418d57dd6 Makes it so that holsters can be hidden by suit-slot items. 
I have yet to actually make any suit-slot items hide holsters.
 2016-11-09 23:23:19 -06:00
Anewbe
5bb82a0e25 Fixes borg shocks 2016-11-07 20:45:15 -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
Arokha Sieyes
919c5f1962 Merge pull request #691 from VOREStation/itemswap 
Swap 'Give' dialog buttons
 2016-11-04 15:32:28 -04:00
Anewbe
2ca61948a5 Merge pull request #2692 from Anewbe/slowdown_fixed 
Species var to ignore the effects of item slowdown
 2016-11-02 16:30:01 -05:00
Anewbe
eb7aae0a96 Merge pull request #2690 from Anewbe/huge_mob 
Adds another mob_size class
 2016-11-02 16:29:44 -05:00
Spades
24fa7d761c Merge pull request #667 from Cameron653/master 
Makes Diona a whitelisted race
 2016-10-30 17:39:53 -04:00
Anewbe
da77d7d511 Merge pull request #2682 from Yoshax/danktreememes420swagit 
NO_POISON or IS_PLANT now grant hallucination immunity
 2016-10-29 21:20:23 -05:00
Anewbe
6fd82d6d3f Adds in a var that allows species to ignore the slowdown effects of items 2016-10-28 17:02:29 -05:00
Anewbe
db64643e4f Adds another mob_size class 2016-10-27 22:41:29 -05:00
Anewbe
59d410348a Fixes Aviators blocking flash incorrectly, adds in stylish aviators 2016-10-26 21:06:51 -05:00
Arokha Sieyes
4d9bb0736d Swap 'Give' dialog buttons 
"Yes" on the left to be consistent with other dialogs. The number of times people (myself included) misclick because of this is impressive. Or just accidentally cancel out while typing.
 2016-10-26 11:49:03 -04:00
Techhead
c344d6345f NO_POISON or IS_PLANT now grant hallucination immunity 
Also stops hallucinations from preventing passing out from halloss.
Resolves #14395
Resolves #12425
 2016-10-25 21:21:57 +01:00
Yoshax
11209a5b0e Tweaks path from sechud/toggle to sechud/aviator 2016-10-25 20:40:26 +01:00
Yoshax
cf35da203b Tweak the code, adds a couple of ❄️ to make it work 2016-10-25 19:18:01 +01:00
Neerti
1e3a2791d6 Merge pull request #2655 from Anewbe/disarm_spam 
Disarm spam is less effective
 2016-10-24 19:34:07 -04:00
Neerti
0bc0136f40 Merge pull request #2661 from Anewbe/shaved 
Adds shaved short hair and five o'clock shadow beard
 2016-10-24 19:30:58 -04:00
Spades
18c759259b Merge pull request #680 from VOREStation/microtweak 
Fix teshari spawn bug (and lack of dark overlay) and micros(?)
 2016-10-23 18:25:03 -04:00
Cameron653
5cfa87ee1c Adds an end bracket 2016-10-23 17:53:01 -04:00
Spades
b70ca45329 Catgirl Icons 
Adds more catgirl icons.
 2016-10-23 17:21:30 -04:00
Anewbe
c3c01e655d Slightly reworks the way spiders inject poison 2016-10-23 14:43:35 -05:00
Anewbe
8c509f5843 Merge pull request #2656 from ParadoxSpace/spidervenom 
Nurse Spider Fixes
 2016-10-23 13:05:29 -05:00
Arokha Sieyes
bd3a749c13 Do NOT qdel() all client.screen objects 2016-10-22 22:12:54 -04:00
Arokha Sieyes
c2c96e37b6 Do NOT qdel() all client.screen objects 2016-10-22 22:12:11 -04:00
Arokha Sieyes
9730557674 Omnihud glasses 2016-10-22 18:14:27 -04:00
Anewbe
a1b1cf62c8 Disarm spam is less effective 2016-10-22 13:02:26 -05:00
Anewbe
5e730703b5 Adds shaved short hair and five o'clock shadow beard 2016-10-21 18:41:39 -05:00
Arokha Sieyes
780f0fa603 Squelch death messages from inside mobs 2016-10-21 15:37:22 -04:00
Arokha Sieyes
5de7a29ca4 Tweaks to restore a few VS things 2016-10-21 01:00:59 -04: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
Cameron653
327b520edc Whitelists diona 2016-10-20 13:58:55 -04:00
Screemonster
e59c33b554 fixes and improves some bugs 2016-10-20 04:03:46 +01:00
ParadoxSpace
5dfca8979e Update giant_spider.dm 2016-10-18 14:49:51 -06:00
ParadoxSpace
6a9c448887 Update giant_spider.dm 2016-10-18 13:47:14 -06:00
Spades
d908eccf95 Merge pull request #659 from VOREStation/disallow-empty-ooc-notes 
Force having OOC notes set to spawn
 2016-10-18 14:47:19 -04:00
ParadoxSpace
45611d9e63 Update giant_spider.dm 2016-10-18 11:08:30 -06:00
Eearslya
334cb48dab Force having OOC notes set to spawn 2016-10-17 23:25:07 -07:00
Anewbe
33b00b8762 Lowers the dislocate chance and damage from disarm intent hits 2016-10-16 21:47:42 -05:00