cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,437 Commits 9 Branches 26 Tags
f2df54c60b032e992817ebcc4187c7eeef6dce78
Commit Graph

7192 Commits

Author SHA1 Message Date
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
Eearslya
066e50e61e Fixes attacking from inside voremobs, again 
Fixes #541
 2016-10-16 15:36:47 -07:00
Dhaeleena
c5fe33dcdb This adds the Deform sprites for the new female tajaran torso (Clone damage) 2016-10-13 09:32:40 -03:00
Dhaeleena
a9f331842e Adds Female tajara sprite back to the game. Resolves Issue #629 Thank DeepIndigo for the sprites. 2016-10-12 23:16:18 -03:00
Anewbe
5bfc0c851e Changes the way embedding works 2016-10-11 21:29:49 -05:00
Spades
570c2474c3 Fixes w_class of items to be consistent with Polaris update (#636) 
* Fixes w_class of items to be consistent with Polaris update

* Typo
 2016-10-09 19:23:10 -04:00
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Spades
05869b0d9b Zoo.dmm added, Vault updated, various bugfixes (#634) 
* :(

* Ports https://github.com/PolarisSS13/Polaris/pull/2571 early.

Need this for a map I wanna do.

* need sleep

* Emergency meds added

Resolves https://github.com/VOREStation/VOREStation/issues/600

* Fixes Fax Machine showing Sif Government

* Updates Tajaran lore to match Polaris.

* Sleeping for tonight

* Fixes #623

* Added more to the map

* Fox sprites from Paradise added

* Vore bee added

* Technical stuff no one cares about.

* Another update

* Reverts Pull #508

https://github.com/VOREStation/VOREStation/pull/508 messed up digesting
dead mobs and mice.

* Sergaling are now Saru.

* Saru

* Zoo map update, near completion

* Zoo map finished, plus Station Vault updated

* Revert "Ports https://github.com/PolarisSS13/Polaris/pull/2571 early."

This reverts commit 59e2bb2117.

* Buzz off, Travis.

* Removed microwaves entirely so Travis stops bitching

* Travis stop being dumb

* Fix the zoo map once and for all..?

* Removes backup files.
 2016-10-09 18:55:17 -04:00
Spades
2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
Anewbe
2f5f9b5c78 Fireaxes no longer embed every hit 2016-10-05 18:00:57 -05:00
Eearslya Sleiarion
2e5f80175c Prevent attacking vore mobs from within them (#627) 2016-10-05 12:50:04 -04:00
Anewbe
7bef4447cd Merge pull request #2593 from Neerti/10/4/2016_technomancer_changes 
Technomancer Bug Fixes & Tweaks
 2016-10-04 20:30:01 -05:00
Neerti
0d140349b3 Technomancer Bug Fixes & Tweaks 
Cores can now be locked and unlocked by a verb.  Locked cores cannot be removed by anyone.  Cores automatically unlock if the wearer dies or otherwise stops existing for some reason.
Healing spells now induce a flat instability cost on the healer instead of it being split between healer and healed.  The amount healed is greatly increased if used on someone besides the healer.
Mend Organs is now called Great Mend Wounds, and now heals broken bones, IB, eye damage, and blood loss in addition to internal organs.
Radiating instability (the purple glow) now gives a warning to people afflicted.
Instability discounts should start applying correctly for specific cores.
Instability now affects all living mobs and not just humans.  This includes borgs and simple animals.
Phase shift now adds ongoing instability while hiding inside the rift.
Projectile spells should be logged now.
Wards last forever, and should not die in vacuum now.
Restoration aura is now green colored and not blue.
Simple mobs and cyborgs are now harmed by lightning.
 2016-10-04 21:09:15 -04:00
Eearslya Sleiarion
b1b0f28938 Allow cyborg combat module in code red (#577) 
* Allow cyborg combat module in code red

* Tweaks to combat module for balance purposes
 2016-10-04 02:59:07 -04:00
Neerti
2157d42c0d Fixes runtime on embedding 
Turns out heads can't be compared to numbers on their own.
 2016-10-03 21:13:49 -04:00