cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,903 Commits 8 Branches 0 Tags
7b54a9298d5d08f81438c5b8de3f126d7b7f1c16
Commit Graph

87 Commits

Author SHA1 Message Date
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
Kashargul
a92a42b85b converts our spans (#9185) 2024-10-07 20:47:23 +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
CHOMPStation2
4153768ba1 [MIRROR] Job rank and radio channel rework (#8965) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-17 21:24:13 +02:00
CHOMPStation2
c0bff32ead [MIRROR] Reduces amount of drone racism (#8357) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-05-10 19:30:31 +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
Selis
ab7c087902 Juke Build Update (#7708) 2024-02-09 18:40:21 +01:00
CHOMPStation2
a4280d14e1 [MIRROR] Many bug fixes, QoL, and PDA notes port (now with sensible diffs) (#7588) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Nadyr <forlirnglacignis@gmail.com>
 2024-01-19 09:26:26 -05:00
Nadyr
c81676a813 Codex code improvements, recipes (#7068) 2023-10-12 15:57:12 -04: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
025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
Novacat
9f65f14549 Merge pull request #14209 from Heroman3003/runtimes-fixes-icons 
Some runtime fixes + oldchat icons
 2022-12-17 22:39:10 +00:00
Casey
a546c9098b Merge pull request #13830 from VOREStation/upstream-merge-8711 
[MIRROR] Post-Timeskip News Update [ABLE TO BE MERGED]
 2022-10-10 02:56:35 +00:00
Aronai Sieyes
3aca93de9b Merge pull request #11500 from VOREStation/upstream-merge-8209 
[MIRROR] Prevents Pop-up for Already Seen Lore News
 2021-08-26 16:57:27 +00:00
Novacat
9c209652a9 Merge pull request #9988 from VOREStation/upstream-merge-7973 
[MIRROR] News Update  + Communicator Lag Fix
 2021-03-21 21:25:45 +00:00
Chompstation Bot
5a70c39b08 [MIRROR] Lobby Improvements 2021-03-09 22:32:57 +00:00
Chompstation Bot
bef209f13c [MIRROR] Excised Errant Bay Military Lore 2021-02-13 05:51:00 +00:00
izac112
74d84d2cff Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-17 09:44:00 +02:00
Atermonera
1266d146b1 Merge pull request #7483 from Cerebulon/newsAug2020 
News update... April-May 2020
 2020-08-15 23:51:52 -04:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Schnayy
99a977ee3d Merge pull request #6799 from Cerebulon/booksprites 
New book sprites + inhands
 2020-07-09 17:33:58 -04: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
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
Novacat
4c7db1fc2d Update codex.dm 2020-03-15 14:45:18 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera
6bcb84b44a Merge pull request #6796 from Cerebulon/newsUpdatemar2020 
Oct-Feb News Update
 2020-03-10 03:37:49 -04:00
Killian
66d2758399 added grey+vox to the codex 
plus some other minor proofreading, and removal of a now-dead link
 2020-03-06 14:25:00 +00:00
Killian
13e5e7a495 traffic & lore update 2020-03-06 06:25:27 +00:00
Killian
92e988d3c4 edit comments 2020-02-16 06:34:09 +00:00
Killian
76f4ffe0de traffic! 2020-02-16 05:28:11 +00:00
Unknown
7931795ddd Compatability, Re-enables old library 2019-11-08 10:47:32 -05:00
Mechoid
551dd02a80 Setup for New Library 2019-11-04 21:25:18 -05:00
Atermonera
cd34901747 Merge pull request #6474 from Cerebulon/newsoct19 
June-October News Update
 2019-10-06 03:33:55 -04:00
Atermonera
bbb3201dc2 Merge pull request #6234 from Cerebulon/newsJune19 
Feb-June News Update
 2019-06-28 20:12:47 -04:00
Novacat
912111d5ea Merge branch 'master' into upstream-merge-5908 2019-03-28 15:19:53 -04:00
Unknown
039b6c2b6c Why is this even a conflict 2019-03-27 04:41:57 -04:00
Atermonera
49bdfc2db6 IC News update for 1st Jan 2019-03-27 04:41:39 -04:00
Novacat
8cb235f1e7 Merge pull request #4615 from VOREStation/upstream-merge-5795 
[MIRROR] Standardises SifGov to VirGov
 2019-03-27 03:40:16 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Cerebulon
c64540d054 January News Update 2019-01-30 02:31:09 -05:00
Anewbe
a497071bac Standardises SifGov to VirGov 2018-12-28 18:56:15 -05:00
Anewbe
0bcfa1a5b3 Merge pull request #5746 from elgeonmb/loreupdateepsilon 
Adds like 4 million articles.
 2018-12-07 21:04:21 -05: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
elgeonmb
b0fb57fb02 may 15 lore (#5268) 
* actually did it day of

* actually I think this is more fitting

* i never learrned how to spell good
 2018-05-18 21:09:03 -07:00
elgeonmb
fb01f13175 hey guess what its the same thing again 2018-05-08 18:59:59 -07:00
Arokha Sieyes
6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00
elgeonmb
c12368b887 Adds new robot codex (#5178) 
* adds new robot codex

* appeases ater
 2018-04-20 10:30:06 -07:00
Aronai Sieyes
35ec513b28 Merge pull request #3452 from VOREStation/aro-sync-04122018 
Polaris Sync 04-12-2018
 2018-04-18 14:04:27 -04:00