cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-08 23:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,213 Commits 10 Branches 0 Tags
df5f77880ab1ae3fb03e5d64144c8a2bafa672ea
Commit Graph

70 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
f85a202d80 [MIRROR] Refactors do_after w/ TG's do_after (#11486) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-08-22 20:35:16 -04:00
CHOMPStation2StaffMirrorBot
bb70ca1093 [MIRROR] Icon Fixup [IDB IGNORE] (#11451) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-08-17 20:03:49 -04:00
CHOMPStation2StaffMirrorBot
2c9453b5c3 [MIRROR] var/global/list -> GLOB. conversion (#11193) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-07-16 00:24:42 +02:00
CHOMPStation2StaffMirrorBot
2f9c80a23d [MIRROR] Tesh lore update (#10864) 
Co-authored-by: TankTheBirb <96669534+TankTheBirb@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-05-12 00:34:46 +02:00
CHOMPStation2StaffMirrorBot
16a213f699 [MIRROR] Have you bingled that (#10545) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-29 22:12:53 +01:00
CHOMPStation2StaffMirrorBot
f543fd71e2 [MIRROR] ATC Refactor (#10422) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-16 01:03:17 +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
ce2446922e [MIRROR] Initialize fixing (#10335) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-08 22:22:04 +01:00
CHOMPStation2StaffMirrorBot
a967fb3861 [MIRROR] Check for 516 byond:// hrefs (#9624) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-13 00:55:48 +01:00
CHOMPStation2StaffMirrorBot
891d585ede [MIRROR] Space Traffic Update, Cleanup, & KHI Removal (#9600) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-08 21:10:26 +01:00
CHOMPStation2StaffMirrorBot
09f82b6fff [MIRROR] The final action buttons PR (#9324) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-27 00:00:36 +02:00
CHOMPStation2
45025bd128 [MIRROR] Ports tgstation/tgstation/pull/15673 (#9270) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-20 23:08:28 +02:00
CHOMPStation2
7416cbea22 [MIRROR] next set of spans (#9247) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-18 01:33:07 +02:00
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-04 15:00:17 +02:00
CHOMPStation2
31407a0be3 [MIRROR] First part of a span rework (#9120) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-02 16:25:48 +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
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
CHOMPStation2
670e137858 [MIRROR] adv/debug cataloguer sprite fix (#7688) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-02-04 23:11:18 +01:00
Raeschen
74765cf864 fix merge conflicts 2023-06-19 12:32:36 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Heroman3003
3d53d2bb62 Little Weakref Refactor 2023-06-03 09:22:18 +00:00
Casey
56b51e8ef2 [READY] Adds Altevian species 2022-08-12 18:05:36 +00:00
Casey
fd5a1d7ce2 Merge pull request #12820 from Heroman3003/slow_sizegun 
Adds gradual sizegun
 2022-04-24 07:16:37 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Nadyr
bddfb995a2 Merge pull request #1912 from CHOMPStationBot/upstream-merge-10222 
[MIRROR] Catalogue Entries V1
 2021-05-14 01:15:36 -04:00
Nadyr
88bac3f6e1 chompedits 2021-05-14 00:52:13 -04:00
Novacat
b3dff06b07 Merge pull request #10222 from klaasjared/Explo-Catalogue-Entries 
Catalogue Entries V1
 2021-05-07 23:22:22 +00:00
Razgriz
0f88cbd803 Catalogue update 
Supplants #1827 because stop paring useless crap with lore crap.
 2021-04-21 21:40:45 -07:00
izac112
9044c9da02 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-04 00:15:48 +02:00
Unknown
3fe46bbf8d Unlimited Credit Sharing Range 
It is bad for someone to miss out on points because they were 16 tiles away instead of 14.
 2020-08-03 14:49:24 -04:00
izac112
dd22d0093c fixes 2020-06-17 04:36:50 +02:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Killian
bd50595244 improved traffic, take two 2020-06-10 22:26:23 +01:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493) 
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
 2020-04-29 19:59:03 -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
Atermonera
b6eff8d0cf cataloguers fit in belt slot (#6946) 2020-04-04 22:33:13 -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
Unknown
c5ef02af6e Fixes cataloguer stuff 2020-02-25 15:46:42 -05:00
Unknown
2604093ff0 Species consolidation 
- Consolidates the two zorren species into one zorren species.
- Merges Xenohybrid into Custom species, Xenohybrids no longer whitelisted.
 2020-02-25 15:45:10 -05:00
SplinterGP
796d9fdd26 Adds grey to cataloguer, adds blurb, minor change in telep, adds spawn 2020-02-25 14:15:09 -03:00
Cebutris
b22008f01f i probably should have tried to compile this before making the PR but i'm not that smart 2019-12-31 05:06:37 -05:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Cebutris
14d6527103 delete KHI 2019-09-14 13:17:20 -04:00
Unknown
b804342c26 Merge remote-tracking branch 'VOREStation/master' into nova-pathfinder 2019-08-25 22:09:52 -04:00
Unknown
a7bc6b858d Redemption Machine Changes 
- Brings back silver pickaxe
- Merges Polaris and Virgo Exploration Vendors
- Ports early fixes to exploration vendor from Polaris
 2019-08-21 20:17:39 -04:00