cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,311 Commits 6 Branches 0 Tags
f08d4c2cd066bc56b0ab7f787d578297ea52d62d
Commit Graph

100 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
2cd485cbba [MIRROR] Adds Gooborgs & Toggleable Stomach Glowing for Borgs (#10418) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-15 01:43:00 +01:00
CHOMPStation2StaffMirrorBot
cb0f8f33ac [MIRROR] up port map tests (#10378) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-14 02:07:45 +01:00
CHOMPStation2StaffMirrorBot
65f21fb1d3 [MIRROR] end of file Fix (#10355) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-11 17:58:14 +01:00
CHOMPStation2StaffMirrorBot
9543740f7a [MIRROR] fix robot linting [IDB IGNORE] (#10301) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
 2025-03-04 11:46:36 +01:00
CHOMPStation2StaffMirrorBot
38658b4dad [MIRROR] Rig glovefix and Clothing protection fix (#10263) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-03 01:45:32 +01:00
CHOMPStation2StaffMirrorBot
ede45bae10 [MIRROR] Robot Sprite Unit test, Robot Upports, Robot Sprite Fixes [MDB IGNORE] [IDB IGNORE] (#10241) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-02 00:18:02 +01:00
CHOMPStation2StaffMirrorBot
515df0c7ac [MIRROR] Reagent unit testing (#10166) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-02-15 05:47:07 +01:00
CHOMPStation2StaffMirrorBot
7bfffc808d [MIRROR] Adds Trait Genetics (#10142) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-02-13 15:41:59 +01:00
CHOMPStation2StaffMirrorBot
ba992cc896 [MIRROR] More cosmetic strictness (#10140) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
 2025-02-11 07:16:31 +01:00
CHOMPStation2StaffMirrorBot
116219bee6 [MIRROR] Fixes the body designer [WIP] (#10105) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-02-08 23:50:15 +01:00
CHOMPStation2StaffMirrorBot
ec71611656 [MIRROR] (Partially) Fixes Out Of Memory crashes (#10092) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-02-07 16:36:42 +01:00
CHOMPStation2StaffMirrorBot
da74c09c7c [MIRROR] adds another unit test, bumps nvmrc (#10019) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-02-01 04:35:37 +01:00
CHOMPStation2StaffMirrorBot
a7e4ef7dad [MIRROR] Some ZAS tweaks and minor optimizations (#9544) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-01 18:31:06 +01:00
Kassc
a5b8cb92d1 Soluna Nexus map fixes 1.0 (#9276) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-22 21:06:28 +02:00
ShadowLarkens
21b3305c29 Add bapi-dmm, a rust maploader that goes BRRRRRRR (#9201) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-20 14:20:02 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
Kassc
dbfbd31e29 Construction Site! (Event spoilers) (#9000) 
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-22 22:39:08 +02:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CHOMPStation2
c55baec811 [MIRROR] Cleaning up some defines (#7726) 
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Selis <selis@xynolabs.com>
 2024-02-12 15:55:15 +01:00
Heroman3003
3d53d2bb62 Little Weakref Refactor 2023-06-03 09:22:18 +00:00
Heroman3003
d99151151c Resolves SDMM warnings 2023-03-09 05:20:12 +00:00
Razgriz
0718165340 Update map_tests.dm 2022-07-03 17:30:47 -07:00
Casey
0bbc161244 Enables Multi-Z Testing (Map & Wires) 2022-07-03 09:07:08 +00:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Nadyr
25124cedb6 Merge pull request #2718 from CHOMPStationBot/upstream-merge-11334 
[MIRROR] Update vore space prot test
 2021-08-02 20:50:45 -04:00
Aronai Sieyes
a4122ce793 Merge pull request #11334 from VOREStation/Arokha/spacevoretest 
Update vore space prot test
 2021-08-02 17:33:51 +00:00
Aronai Sieyes
880078a722 Merge pull request #11332 from VOREStation/Arokha/suffotest 
Create a new empty zlevel for testing suffocation
 2021-08-02 16:43:55 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Aronai Sieyes
205ef740bd Merge pull request #10993 from MarinaGryphon/issue/logpile 
Stack Examine Improvements, Log Examine Fix
 2021-07-09 16:19:16 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
8ac2443b9d [MIRROR] Added unit test to ensure emote key uniqueness. 2021-06-14 12:14:19 +00:00
Aronai Sieyes
82f1d179b0 Merge pull request #10571 from VOREStation/upstream-merge-8119 
[MIRROR] Adds unit test for invalid recipes
 2021-06-07 05:10:03 +00:00
Novacat
877dfbc049 Merge pull request #10023 from VOREStation/upstream-merge-8011 
[MIRROR] Ported updated decls repository from Neb.
 2021-03-26 13:46:39 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Razgriz
4e1fbcaba6 Fix vore unit tests? 
Suggested by Black Major.
 2021-02-19 05:33:06 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Neerti
bc1db6310e Adds Modifier Armor (#7416) 2020-08-07 00:25:15 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
izac112
133a5f61d1 Ty Kel, Fixes ## UNIT_TEST: !! FAILURE !! [ZAS: Supply Shuttle] 
## UNIT_TEST: !! FAILURE !! [ZAS: Supply Shuttle]
 2020-05-07 00:22:53 +02:00
TheFurryFeline
f4822d2e4f More Travis fixes. 
sif_ora still runtiming at present. Fix to come when cause is determined.
 2020-04-23 15:27:44 -04:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Leshana
262faa38e4 Replace global all_areas list with world. 
It ends up having similar performance, so might as well not bother with all_areas.
 2020-04-12 18:04:54 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Repede
c6b49dace2 zas test fix 2020-04-05 03:02:23 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00