cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,500 Commits 9 Branches 26 Tags
978fdd28427c15ec5fcf308fdd35bd3a8dd7e4e9
Commit Graph

20946 Commits

Author SHA1 Message Date
Anewbe
978fdd2842 Merge pull request #5309 from Heroman3003/melon-fix 
Fixed fruit salad not being make-able
 2018-05-29 14:35:57 -04:00
Aronai Sieyes
15acf6d79d Merge pull request #3780 from VOREStation/aro-exppermit 
Corrects explorer permit language
 2018-05-28 20:59:33 -04:00
Spades
310dcd4d0d Grammar! 2018-05-28 19:26:56 -04:00
Aronai Sieyes
304c8b6f6f Merge pull request #3779 from Novacat/MiscTweaks 
Fixes Machete Sheaths
 2018-05-28 17:12:36 -04:00
Atermonera
5c4bde965a Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms 
Reverse use of global lists where they hurt performance.
 2018-05-28 15:55:55 -04:00
Arokha Sieyes
0d434fadab Corrects explorer permit language 
Permit doesn't let them carry guns "on the surface", it lets them carry guns while exploring.
 2018-05-28 14:47:07 -04:00
Unknown
8572125d57 Fixes Machete Sheaths 
- Machete sheath now has proper slot assignment, so it can be worn again.
 2018-05-28 12:41:34 -04:00
Verkister
1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes
2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
 2018-05-27 19:26:12 -04:00
Aronai Sieyes
4cddf6ccd0 Merge pull request #3762 from VOREStation/aro-sync-05-25-2018 
Polaris Sync 05/25/2018
 2018-05-27 18:38:44 -04:00
Atermonera
c7aad71147 Merge pull request #5295 from Anewbe/suit_sprite_issues 
Spacesuits are now in their own dmi file
 2018-05-26 15:25:58 -07:00
Atermonera
e1fe4d5a5d Merge pull request #5293 from VOREStation/pol-closets 
Makes closets/crates like boxes
 2018-05-26 15:24:45 -07:00
Atermonera
449a495b54 Merge pull request #5299 from Novacat/spriteadd 
Accessory Fixes
 2018-05-26 15:23:54 -07:00
Atermonera
53db96d193 Merge pull request #5300 from Anewbe/more_runtimes 
Adds a number of accessory related null checks
 2018-05-26 15:23:03 -07:00
Anewbe
13b205ee14 Merge pull request #5297 from Mechoid/FixBorgSynthesizers 
Fix Engi Material Synths
 2018-05-26 11:52:59 -05:00
Mechoid
917c7b71a5 Box of Things for Events and the Future MK1 (#5281) 
* Lots of Stuff for Events

* Adds changelog.

* Review & QOL
 2018-05-25 16:26:31 -07:00
Arokha Sieyes
2308c70a8f SYNC: Alter promethean changes 2018-05-25 15:05:39 -04:00
Anewbe
fbeb390d52 Merge pull request #5277 from Mechoid/SeedpocalypseTheFirst 
Seed storages are hackable.
 2018-05-25 14:03:46 -05:00
Atermonera
5957251397 Merge pull request #5280 from Anewbe/poi_tweaks 
Merc PoI Tweaks
 2018-05-25 10:56:40 -07:00
Anewbe
d8f1069689 Adds a number of accessory related null checks 2018-05-25 12:29:33 -05:00
Arokha Sieyes
088eee3d96 SYNC: Compileability fixes 2018-05-25 13:29:30 -04:00
Unknown
39f9fbec1f Accessory Fixes 
- Only holsters with utility slot can be unsheathed/sheathed by clicking on the suit (to stop conflicts with webbing)
- Heavy Armor Plates no longer have a bugged/invisible icon
 2018-05-25 13:24:00 -04:00
Arokha Sieyes
6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-05-25 13:23:47 -04:00
Arokha Sieyes
3a92a678ce Plane tweak for adminbuse 2018-05-25 12:48:30 -04:00
Mechoid
a4d7699c0f Fix Engi Synths 2018-05-24 22:08:52 -07:00
Anewbe
841837191c Merge pull request #5296 from Anewbe/armor_fix 
Fixes a runtime with armor checks
 2018-05-24 18:39:55 -05:00
Anewbe
beb88f7b7d Fixes a runtime with armor checks 2018-05-24 18:38:57 -05:00
Aronai Sieyes
b1b9090430 Merge pull request #3757 from VOREStation/aro-cblind 
Fix vulp colorblindness being mono instead
 2018-05-24 19:33:24 -04:00
Arokha Sieyes
22bf8684e5 Fix vulp colorblindness being mono instead 
Fixes #3740
 2018-05-24 19:14:57 -04:00
Anewbe
1e05e23a78 Spacesuits are now in their own dmi file 2018-05-24 17:45:45 -05:00
Anewbe
49cf32f3b0 Fixes examine bugs 2018-05-24 17:08:45 -05:00
Aronai Sieyes
abecdfe3fa Merge pull request #3499 from Verkister/engibork 
New dogborg + Recycling update + Wet Dogborgs update
 2018-05-24 17:45:08 -04:00
Aronai Sieyes
243bee8965 Merge pull request #3737 from Verkister/patch-25 
Makes gurgled ID description even more obvious.
 2018-05-24 17:36:59 -04:00
Aronai Sieyes
1d068ef41e Merge pull request #3742 from VOREStation/aro-smite 
Adds 'Smite' verb and pray button
 2018-05-24 17:35:27 -04:00
Aronai Sieyes
a9a293527c Merge pull request #3744 from Mewchild/MC-uniform 
Gives KHI CMD to all command staff
 2018-05-24 17:34:18 -04:00
Aronai Sieyes
86eeeca926 Merge pull request #3747 from VOREStation/aro-promnif 
Fix promthean NIF shoving
 2018-05-24 17:33:12 -04:00
Arokha Sieyes
f9b409549e Makes closets/crates like boxes 
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
 2018-05-24 17:26:17 -04:00
Mechoid
4dbd619b05 Merge pull request #5288 from Anewbe/blockers 
Blockers should no longer be visible
 2018-05-24 13:41:58 -07:00
Atermonera
73450f337d Merge pull request #5284 from Anewbe/item_zoom 
Swapping hands cancels zoom
 2018-05-24 13:19:36 -07:00
Anewbe
63742ba24e Merge pull request #5285 from VOREStation/pol-accessories 
Change accessories to use bitflags
 2018-05-24 14:58:20 -05:00
Anewbe
97748146bc Merge pull request #5287 from VOREStation/pol-smite 
Adds 'Smite' verb and pray button
 2018-05-24 14:53:16 -05:00
Aronai Sieyes
ffb722c44a Merge pull request #3736 from VOREStation/aro-indsuit 
Reduce armor on industrial rig
 2018-05-24 12:26:51 -04:00
Aronai Sieyes
03e709d92f Merge pull request #3739 from Novacat/MiscTweaks 
New Explorer Gear
 2018-05-24 09:18:51 -04:00
Arokha Sieyes
2006b7f113 Switch to shocking head and electrocute_act 2018-05-24 00:57:26 -04:00
Arokha Sieyes
6e33fb7648 Switch to shocking head and electrocute_act 2018-05-24 00:57:02 -04:00
Anewbe
418af6376d Merge pull request #5272 from Lorwp/SARloadout 
Adds SAR to allowed_roles of certain loadout items
 2018-05-23 23:38:33 -05:00
Anewbe
078ed10f93 Merge pull request #5286 from VOREStation/pol-joindays 
Paranoid logging and byond account age
 2018-05-23 23:38:07 -05:00
Arokha Sieyes
3d522eb02f VS: Virgo specific smites 2018-05-23 23:04:07 -04:00
Arokha Sieyes
2fe6a59489 Fix promthean NIF shoving 
Probably fixes #3746
 2018-05-23 22:47:29 -04:00
Anewbe
ebe694c805 Blockers should no longer be visible 2018-05-23 16:59:22 -05:00