cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-20 10:36:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,487 Commits 66 Branches 25 Tags
5c4bde965a41345873f5c90f052dabb77d8b2e25
Commit Graph
43487 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AtermoneraandLeshana 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
SpadesandGitHub 27a5fc3965 Merge pull request #3472 from Verkister/hangryrat 
Adds 'neutral' food begging giant rat.
 2018-05-28 15:28:59 -04:00
VerkisterandGitHub 1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Aronai SieyesandGitHub c5ded806f1 Merge pull request #3765 from VOREStation/aro-prottypefix 
Fix prototype trait showing up
 2018-05-27 21:21:22 -04:00
Aronai SieyesandGitHub 787102a300 Merge pull request #3776 from VOREStation/aro-sync-05-27-2018 
Polaris Sync 05-27-2018
 2018-05-27 21:21:10 -04:00
Arokha Sieyes b96aec1e52 SYNC: Missed another closet (typo) 2018-05-27 19:53:45 -04:00
Arokha Sieyes 1437123502 SYNC: Missed one 2018-05-27 19:43:39 -04:00
Arokha Sieyes 8f8c41a7c1 SYNC: Correct vorestation closets/crates to use new system 2018-05-27 19:33:34 -04: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 SieyesandGitHub ef97bed7f1 Merge pull request #3771 from VOREStation/vplk-merge-mirror-tool 
Adds a nice script required for the PR mirror thing to work.
 2018-05-27 18:38:56 -04:00
Aronai SieyesandGitHub 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
drexampleandAnewbe be5c144a16 Ports Baystation12 newest item pickup animations. Fancy! (#5302) 
* fixed photos

* Added item pick up animation

* Revert useless commit

* Removed unnecessary extra define, made sure ghost object deletes itself after animation, changed planes.
 2018-05-27 11:54:36 -05:00
AnewbeandGitHub 06e2ab736c Merge pull request #5303 from VOREStation/pol-AEcanary 
Active edge canary PR
 2018-05-27 11:50:59 -05:00
Leshana 958d78b418 Adds a nice script required for the PR mirror thing to work. 2018-05-27 01:09:56 -04:00
AtermoneraandGitHub 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
AtermoneraandGitHub e1fe4d5a5d Merge pull request #5293 from VOREStation/pol-closets 
Makes closets/crates like boxes
 2018-05-26 15:24:45 -07:00
AtermoneraandGitHub 449a495b54 Merge pull request #5299 from Novacat/spriteadd 
Accessory Fixes
 2018-05-26 15:23:54 -07:00
AtermoneraandGitHub 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
AnewbeandGitHub 13b205ee14 Merge pull request #5297 from Mechoid/FixBorgSynthesizers 
Fix Engi Material Synths
 2018-05-26 11:52:59 -05:00
Arokha Sieyes c31ac4866d Active edge canary PR 
Plus free unit test upgrade
 2018-05-26 12:03:35 -04:00
Arokha Sieyes 31c7725066 Fix prototype trait showing up 2018-05-26 11:52:53 -04:00
MechoidandAtermonera 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
AtermoneraandGitHub f1b00c9e26 Merge pull request #5292 from Anewbe/crate_layer 
Crates should always appear below their contents
 2018-05-25 16:25:31 -07:00
Arokha Sieyes 2308c70a8f SYNC: Alter promethean changes 2018-05-25 15:05:39 -04:00
AnewbeandGitHub fbeb390d52 Merge pull request #5277 from Mechoid/SeedpocalypseTheFirst 
Seed storages are hackable.
 2018-05-25 14:03:46 -05:00
Aronai SieyesandGitHub e0cc5694f3 Merge pull request #3761 from VOREStation/aro-raplane 
Plane tweak for adminbuse
 2018-05-25 14:54:38 -04:00
AtermoneraandGitHub 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
AnewbeandGitHub 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 SieyesandGitHub b1b9090430 Merge pull request #3757 from VOREStation/aro-cblind 
Fix vulp colorblindness being mono instead
 2018-05-24 19:33:24 -04:00
AnewbeandGitHub 3d39c512ab Merge pull request #5294 from Anewbe/examine 
Fixes examine bugs
 2018-05-24 18:31:57 -05: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 9bc6663930 Crates should always appear below their contents 2018-05-24 17:24:14 -05:00
Anewbe 49cf32f3b0 Fixes examine bugs 2018-05-24 17:08:45 -05:00
Aronai SieyesandGitHub abecdfe3fa Merge pull request #3499 from Verkister/engibork 
New dogborg + Recycling update + Wet Dogborgs update
 2018-05-24 17:45:08 -04:00
AnewbeandGitHub 442f7c9db2 Merge pull request #5290 from Novacat/spriteadd 
Machete Sheath and Sprite Fixes
 2018-05-24 16:42:05 -05:00
Aronai SieyesandGitHub 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 SieyesandGitHub 1d068ef41e Merge pull request #3742 from VOREStation/aro-smite 
Adds 'Smite' verb and pray button
 2018-05-24 17:35:27 -04:00
Aronai SieyesandGitHub 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 SieyesandGitHub ea6336899f Merge pull request #3752 from kcin2001/micromechs 
Fixes the Polecat control board name
 2018-05-24 17:33:35 -04:00
Aronai SieyesandGitHub 86eeeca926 Merge pull request #3747 from VOREStation/aro-promnif 
Fix promthean NIF shoving
 2018-05-24 17:33:12 -04:00
Aronai SieyesandGitHub 1cf83c39b7 Merge pull request #3753 from Mewchild/MC-3749-3743 
Minor mining and Research Tweaks
 2018-05-24 17:32:59 -04:00
Aronai SieyesandGitHub 61836d7571 Merge pull request #3754 from Mewchild/MC-is3587 
Fixes Bar Disposals
 2018-05-24 17:31:54 -04:00