cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,289 Commits 10 Branches 0 Tags
c25bd646df1b6f52ea3ecab5f7718cb0403cea01
Commit Graph

2323 Commits

Author SHA1 Message Date
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
997204960c Spawn statistic_cycle off to not sleep SSticker. 2020-04-13 17:38:12 -04:00
Aronai Sieyes
d7e8a53084 VS: Announcement tweak 2020-04-11 15:59:32 -04:00
Aronai Sieyes
f8d920fd02 Allow 'offmap spawn' jobs to be isolated from station employees 2020-04-11 12:03:10 -04:00
Aronai Sieyes
7d074edf6b VS: Update announcer for telecomms refactor 2020-04-11 12:03:10 -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
Atermonera
027028b314 Repaths collapsible white canes to not anger beepsky 2020-03-25 16:39:18 -04:00
Unknown
a40df7dda7 Earlyports some bugfixes 2020-03-20 00:35:55 -04:00
Novacat
972deeae2d Update announce.dm 2020-03-15 14:42:57 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Aronai Sieyes
967fd17048 Rename to discs_vr.dmi and correct copypaste error 2020-02-29 10:37:41 -05:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Aronai Sieyes
b3b51a7c3a New sprites for discs with unique colors 
Now every disc has a unique color rather than most of them being the same and all of them being in cloning.dmi.

Sprites from CEV-Eris.
 2020-02-20 21:37:15 -05:00
Greenjoe12345
3391de2f42 canes and crutches (#6694) 
* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider
added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout

* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider

added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout
also fixed config.txt fuckup

* fixed a spelling error
 2020-02-19 14:34:41 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
67889b8f99 Merge pull request #6653 from zekesulastin/disable-stat-tracking 
Changes DBCore connection procs to check for config value SQL_ENABLED instead of ENABLE_STAT_TRACKING
 2020-02-03 20:49:32 -05:00
RadiantFlash7
0d40994226 Fixes galore & New away mission 
Beach Away mission is Now Whiskey Station Mission.

Fixes a large number of bugs from github (Help me pls)
 2019-12-16 23:12:56 -05:00
RadiantFlash7
99acb57b34 Bugfixes galore, New beach away, file shrink to 250x250 
Completely revamps the beach mission. No more 'safe' missions for our intrepid explorers.

Fixes a metric ton of bugs that I actually lost count. My head hurts.
Several varients of mobs have event types added to prevent them from wandering, for the away missions.

Also Shrinks files down to 250x250.
 2019-12-16 01:56:56 -05:00
RadiantFlash7
37140bbd6b Tore it out, just like my heart 
Removes all mutiny code and old anouncement code. To be fixed later and re-added. (Breaks travis due to color)
 2019-12-14 12:22:07 -05:00
RadiantFlash7
f86a104f40 Fixes telecoms 
Fixes telecoms, adds mutiny gamemode stuff, still needs fixes before it'll work.
Adds old anouncements file, but desk anouncements are not yet functioning. Disabled for now.
 2019-12-13 16:37:32 -05:00
Hawk_v3
74cc210e21 Merge remote-tracking branch 'server/master' into map 2019-10-05 23:10:09 +01:00
Trilbyspaceclone
5d917f43f3 Update weapon.dm 2019-09-18 20:23:51 -04:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Anewbe
8c84811646 Merge pull request #6236 from Nalarac/patch-3 
Adds Precursor Tech to Research Debugging Device
 2019-06-28 21:22:19 -04:00
Novacat
fb52ec08c6 Merge pull request #5114 from Novacat/nova-weapons 
Expedition Sub-department
 2019-04-28 22:57:13 -04:00
Atermonera
9152030002 Merge pull request #6117 from Neerti/ai_shell_manifest_fix 
Hides AI Shells from the manifest.
 2019-04-22 14:31:22 -04:00
Unknown
6dc8552e8c Finishes this PR 2019-04-21 21:32:39 -04:00
Layla Crosse/Occula Drenn
dde5133e03 Research QoL changes (#6042) 
* Research QoL changes

* Reverts changes relating to blanket print times and Protolathe storage

* Actually changes the design print time.

Why do you hate me github.

* Fixes an enter key error caused by the editor.

* Actually does all of the things I needed to do like a smart person

Which apparently I am not.

* Fixes a newline

Because goddamn it the online editor hates me too.
 2019-04-17 04:51:29 -04:00
Hawk_v3
d893b2dd24 Merge branch 'master' into map 2019-04-14 20:07:12 +01:00
Hawk_v3
8d868fb890 Merge branch 'map' into RadiantMaster 2019-04-14 18:27:05 +01:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Verkister
acdbd65e22 Fixes PDA manifest excluding all non-syndie borgs (#5695) 
* Fixes PDA manifest excluding all non-syndie borgs

I'm preetty sure the original PR had the opposite intention of what it actually did.

* Update obj.dm

* Update obj.dm
 2018-10-21 14:23:48 -04:00
RadiantFlash7
723c3d63be Mapping work+lumber lockers 
Added some structures DMI's to use, adjusted mining+part of xenoarch,
did a lot of work on lower level and maint level, added a few closet
variants for lumberjacks
 2018-08-05 13:21:22 -04:00
Atermonera
5ce99af730 Hides syndi-synths from the manifest (#5411) 
* Manifest doesn't show the same stationbound cyborgs and AIs that the upload consoles don't show

* Manifest doesn't show borgs with scrambedcodes set
 2018-07-15 13:27:47 -04:00
RadiantFlash7
064bcba242 Chapel/monastary, Prison, library/cafe partway 
Chapel area and new chaplain pet 'Ignis', Finalized most of the prison,
added a new monastary to be used by the chaplain/monk, and serves as a
public garden for the crew.
Partway done with cafe and library, currently under work.
 2018-06-26 19:11:15 -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
Lorwp
2d793fb738 Add \the when practical 
Also `[station_name()]` to `the [station_name()]` in dust.dm
 2018-05-02 08:58:07 +10:00
Lorwp
dbcc4efb7c Cleans up Event messages 
Mainly just adding [station_name()] when needed
 2018-04-27 18:57:39 +10:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Arokha Sieyes
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04:00
Arokha Sieyes
2c9bdf3ae4 POLARIS: Revamp logging to be consistent 2018-03-10 17:18:09 -05:00
Heroman3003
29d20e34eb added icons for improved capacitors and scan. modules (#5029) 2018-03-10 15:07:15 -06:00
Arokha Sieyes
68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
 2018-03-03 13:09:57 -05:00
Woodratt
dd7bfd6c43 Wilderness Overhaul 
- Heavy rework of the wilderness, minor adjustments to mining and outpost z-levels. To get to the wilderness you now have to travel through the mine z-level to do so, follow the green flagged path through the mine.
  - Shuttles can now land at a site near the entrance to the wilderness. Removal of the mine shuttle landing pad to move it to the wilderness.
  - New addition of warning sign, thanks to Schnayy.
  - Bugfixes for Heist shuttle not going back to raider post, light overlays on shuttle areas, and certain shuttles not leaving behind floor tiles when they should.
 2018-02-26 20:10:46 -08:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
 2018-02-07 19:30:50 -05:00
MarinaGryphon
72318d46b6 Replaces most of the gender macros. (#4681) 
* Fixes #4632.

* 1:27 am coding best coding

* fixes a warning

* Removes the last of the gender macros. Gender is dead.

* gender II: the travis-ing

* linebreaks are dead too.

* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
 2018-02-03 14:40:09 -06:00
Leshana
4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01 
# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png
 2018-02-01 23:55:47 -05:00