cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 11:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,536 Commits 6 Branches 0 Tags
dac673181c89776738588ffd64b51cdc32aa259b
Commit Graph

550 Commits

Author SHA1 Message Date
Repede
123050bcd0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/game/jobs/job/civilian_chaplain.dm
#	code/modules/mob/language/station_vr.dm
 2018-07-08 11:38:06 -04:00
Atermonera
308c4b64e0 Renames Taj Sign Language 2018-07-02 00:49:17 -04:00
Aronai Sieyes
2e0e39b627 Merge pull request #3949 from VOREStation/upstream-merge-5361 
[MIRROR] Ports Siik'Tajr from Baystation
 2018-07-02 00:36:20 -04:00
Unknown
14d64a5570 Duplicate PR revert and minor bugfix 
- Reverts Virgo Siik'Tajr, since Polaris decided to implement it upstream
- Fixes a bug that caused the Pathfinder's locker script to instead trigger on explorer lockers
 2018-06-29 16:25:20 -04:00
Anewbe
8b813107c1 Merge pull request #5361 from Novacat/spriteadd 
Ports Siik'Tajr from Baystation
 2018-06-29 15:49:56 -04:00
Repede
d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-29 09:58:53 -04:00
Aronai Sieyes
859b06497b Merge pull request #3874 from Novacat/nova-pathfinder 
Ports Siik'Tajr from Baystation
 2018-06-24 01:02:52 -04:00
Repede
2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-23 17:53:13 -04:00
Aronai Sieyes
c06339487a Merge branch 'master' into upstream-merge-5335 2018-06-16 17:43:55 -04:00
Arokha Sieyes
7c050dd35c Fix merge conflict, update virgo planet things 2018-06-16 10:43:45 -04:00
Anewbe
98b3af60fa Move planets to SSplanets 2018-06-15 19:05:38 -04:00
Unknown
c691ad5b8d Ports Siik'Tajr from Baystation 
Tail Sign language!
 2018-06-13 02:13:31 -04:00
Atermonera
7cd1442e8f Ports some Bay hair code 2018-06-12 03:43:57 -04:00
Repede
b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm
 2018-06-02 18:33:44 -04:00
Aronai Sieyes
40b1a56bdc Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)"" 2018-06-01 20:35:28 -04:00
Arokha Sieyes
c0c091ed4a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018 
# Conflicts:
#	code/modules/power/lighting.dm
#	icons/turf/walls.dmi
 2018-05-29 21:05:27 -04:00
Anewbe
d308cb4563 Merge pull request #5269 from deathride58/fancylighting 
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
 2018-05-29 13:33:27 -05:00
Leshana
d430448ebf Split and clarify global lists of processing vs non-processing machinery. (#5307) 
* Renaming local var 'machines' to avoid confusion with the global var of same name.

* Delete the unused process scheduler machinery.dm file.  Long since replaced with SSmachines

* Split and clarify global lists of processing vs non-processing machinery.

- Renamed the list of processing machinery from "machines" to "processing_machines"
- Added new global list "machines" to be a list of all machines.
- Since nearly every reference to machines actually wanted to iterate over all machines anyway, this works out great.
 2018-05-28 15:57:02 -04:00
Leshana
30f10be83e Split and clarify global lists of processing vs non-processing machinery. (#5307) 
* Renaming local var 'machines' to avoid confusion with the global var of same name.

* Delete the unused process scheduler machinery.dm file.  Long since replaced with SSmachines

* Split and clarify global lists of processing vs non-processing machinery.

- Renamed the list of processing machinery from "machines" to "processing_machines"
- Added new global list "machines" to be a list of all machines.
- Since nearly every reference to machines actually wanted to iterate over all machines anyway, this works out great.
 2018-05-28 12:56:49 -07: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
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
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
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
Anewbe
1e05e23a78 Spacesuits are now in their own dmi file 2018-05-24 17:45:45 -05:00
Anewbe
63742ba24e Merge pull request #5285 from VOREStation/pol-accessories 
Change accessories to use bitflags
 2018-05-24 14:58:20 -05:00
Arokha Sieyes
3d522eb02f VS: Virgo specific smites 2018-05-23 23:04:07 -04:00
Arokha Sieyes
be45e56f2f Adds 'Smite' verb and pray response button 
For easier adminbuse!
 2018-05-23 13:47:48 -04:00
Arokha Sieyes
89a36024c2 Adds 'Smite' verb and pray response button 
For easier adminbuse!
 2018-05-23 13:47:16 -04:00
Repede
7628d85140 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-05-23 00:13:07 -04:00
Arokha Sieyes
80ffd86b0e Change accessories to use bitflags 
Allows accessories to 'block' multiple slots
 2018-05-22 15:55:22 -04:00
Leshana
d53f405fb0 Merge pull request #3709 from VOREStation/aro-sayreflect 
Message send failure reflection
 2018-05-16 20:46:19 -04:00
Aronai Sieyes
41a997d43e Merge pull request #3687 from VOREStation/aro-ssao-ex 
Exclude some things from SSAO
 2018-05-16 18:44:39 -04:00
Arokha Sieyes
297ac38eca Message send failure reflection 
When a post is too long to send, reflect it back to the user in the chatbox so they can copypaste it into separate messages. Also increases the message limit from 1024 to 2048. If a message is longer than 5-messages worth, it is not reflected and a warning is sent instead to avoid easily consuming bandwidth for DDOS purposes with long messages.

I'd like to add markers in the message where the posts would have been truncated but that's... complicated.
 2018-05-16 17:57:26 -04:00
deathride58
718ca41ea0 tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1 2018-05-16 01:42:01 -04:00
Arokha Sieyes
4018e14d12 Revert "Upgrades Planetary Weather to vis_contents (#5170)" 
This reverts commit e3e1a7ad9c.
 2018-05-15 00:57:55 -04:00
Arokha Sieyes
bdfa34c911 SSAO object excludes 
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
 2018-05-14 11:54:10 -04:00
Arokha Sieyes
91f0c05a4b SSAO object excludes 
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
 2018-05-14 11:38:22 -04:00
Aronai Sieyes
59a852ae45 Merge pull request #3661 from VOREStation/aro-ssao-vs 
Ports 'fake' SSAO from /tg/ as a preference
 2018-05-13 23:33:02 -04:00
Aronai Sieyes
ba6a2b5641 Merge pull request #3668 from VOREStation/polaris-sync-2018-05-01 
Polaris Sync 2018-05-01
 2018-05-13 23:20:18 -04:00
Repede
9e69f25327 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
 2018-05-13 21:08:22 -04:00
Neerti
7b73336244 Merge pull request #5261 from VOREStation/aro-ssao 
Ports 'fake' SSAO from /tg/ as a preference
 2018-05-13 17:20:28 -04:00
Arokha Sieyes
4706bf1801 Resolve shower curtain/steam layering issue 
Reported in https://github.com/VOREStation/VOREStation/issues/3594, curtains and steam layer under mobs due to the plane update. This fixes that, and causes them to layer correctly.
 2018-05-12 15:29:17 -04:00
Aronai Sieyes
fd04336d89 Merge pull request #3655 from VOREStation/aro-fps 
Adds a client FPS setting
 2018-05-10 15:46:29 -04:00
Leshana
33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
 2018-05-10 13:48:20 -04:00
Anewbe
8615dafd40 Merge pull request #5255 from VOREStation/pol-fps 
Adds a client FPS setting
 2018-05-10 00:27:44 -05:00
Arokha Sieyes
2e59a88d82 VS: Plane renumber for SSAO 2018-05-09 14:52:01 -04:00
Arokha Sieyes
f746821964 Ports 'fake' SSAO from /tg/ as a preference 
Allows players to pick whether they want this visual feature or not. Basically adds drop-shadows to objects and stuff. It's off by default.
 2018-05-09 14:51:07 -04:00
Arokha Sieyes
634527aa5b Ports 'fake' SSAO from /tg/ as a preference 
Allows players to pick whether they want this visual feature or not. Basically adds drop-shadows to objects and stuff. It's off by default.
 2018-05-09 14:49:00 -04:00
Aronai Sieyes
cad6ace6b0 Merge pull request #3624 from VOREStation/exp-rust-g 
Implement rust-g library for logging
 2018-05-08 11:22:52 -04:00
Arokha Sieyes
8f876de645 Adds a client FPS setting 2018-05-07 23:37:47 -04:00