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
79,865 Commits 8 Branches 0 Tags
499e8e7ee9b2f51a9e2fae8faaf0d67f16cd86f5
Commit Graph

90 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
a245b8687f [MIRROR] usr to user part two (#10015) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-31 22:27:34 +01:00
CHOMPStation2StaffMirrorBot
f72f2f8c89 [MIRROR] Server maint subsystem (#9408) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-04 22:00:41 +01:00
CHOMPStation2
4d9879937f [MIRROR] Port tg statpanel (#9242) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-17 23:29:59 +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
CHOMPStation2
8bf5fcef35 [MIRROR] Add examine_block to mob examine (#8951) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-13 11:54:24 +02:00
CHOMPStation2
fa89394187 [MIRROR] Exact Temp & Pressure on Armour Examine (#8537) 
Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-06-17 11:34:12 +02:00
CHOMPStation2
15863e00f8 [MIRROR] Undefines local defines and moves global to __define (#8502) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-06-09 18:26:41 +02:00
Kashargul
e28fa96705 Tg panel patch 2 (#8085) 
Co-authored-by: Cadyn Bombaci <cadynspacetechguy@gmail.com>
 2024-05-15 13:42:13 +02:00
CHOMPStation2
c5d592fd77 [MIRROR] Fixes inconsistant material refunds and removes material cost from door repair (#8215) 
Co-authored-by: Reo Lozzot <84661000+ReoDaProtovali@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-04-17 09:34:18 +02:00
CHOMPStation2
234aed941f [MIRROR] fix some runtimes and an overlay overflow (#8210) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-04-11 07:47:45 +02:00
Cadyn
ccad338c93 Tgpanel (#8007) 
Co-authored-by: ItsSelis <selis@xynolabs.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-03-24 12:19:07 +01:00
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +01: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
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
CHOMPStation2
b011e089d0 [MIRROR] fixes and filters (#7452) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Selis <selis@xynolabs.com>
 2023-12-21 00:50:10 +01:00
CHOMPStation2
13274e1044 [MIRROR] Armour Examine Tweaks (#7042) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-26 16:51:34 +02:00
CHOMPStation2
eeeea1468a [MIRROR] Makes the examine panel present more readable colours when using darkmode (#6728) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-06 01:08:39 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Nadyr
d26d90028d Merge pull request #5934 from CHOMPStation2/upstream-merge-14662 
[MIRROR] Weapon Info on Examine
 2023-03-17 03:19:20 -04:00
Heroman3003
5922267371 Merge pull request #14662 from KillianKirilenko/kk-wepdesc 
Weapon Info on Examine
 2023-03-14 18:44:19 +00:00
Heroman3003
8ab9a847d0 cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else 2023-03-10 06:51:22 +00:00
Casey
88543dee02 Merge pull request #13858 from VOREStation/Cameron653-patch-1 
tweaks armor descriptors
 2022-10-10 03:03:46 +00:00
Casey
524cd2e671 Adds personal shield generators. [READY FOR MERGE] 2022-09-23 00:53:41 +00:00
Casey
1212aff811 Merge pull request #12797 from Very-Soft/mobexamine 
Mob Examine
 2022-04-20 08:25:48 +00:00
Novacat
086f4ff0b8 Merge pull request #10233 from VOREStation/upstream-merge-8053 
[MIRROR] Fixes Stunrevolver PATH
 2021-05-01 01:23:02 +00:00
Novacat
6af8ca393b Merge pull request #9900 from VOREStation/upstream-merge-7958 
[MIRROR] Fixes context-menu examine expanding incorrect target
 2021-03-10 19:46:45 +00:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Cerebulon
7c57c7c0bd Vendor enhancement fixes (#7577) 
* Vendor enhancement fixes

* skrellsnax trash, tuna name
 2020-08-30 02:49:00 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Atermonera
83e9effdf7 Merge pull request #7519 from Meghan-Rossi/grassbuilding 
Allows building plating on grass
 2020-08-21 01:26:56 -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
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes
bd298810f2 Redo examining in general and tweak getFlatIcon 2020-05-06 18:37:46 -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
bd31afc54f Fixes examine panel icons (#6914) 2020-03-29 18:02:51 -04: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
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Shadowfire
57464baadc port 0.9.9.9 
just uploading so others can see work, still not ready for commitment
 2020-02-08 01:11:36 +01:00
Razgriz
8968f6f527 Add files via upload 2019-12-25 04:18:45 -07:00
Repede
e7a5341f2d Adds f13 (Mauser) brand cigarettes to game vending machines. 2019-10-17 19:09:57 -04:00
Neerti
9d46150515 Adds pressure protection bounds to clothing. 2019-03-27 13:26:07 -04:00
Leshana
b4b9cea362 Make light switches constructable 
Adds constructable light switches using Brown's construction stage icons.
 2018-02-14 21:26:00 -05:00
Cyantime
36f8c56537 Fixes 'varient' 2018-01-08 16:42:20 -05:00
Anewbe
ef735ea89b Merge pull request #4098 from Neerti/10/15/2017_surface_stuff 
Touches Up the Surface Somewhat
 2017-10-19 09:36:03 -05:00
Neerti
95d93dae00 Touches Up the Surface Somewhat 
Changes the rock texture to hopefully be a bit better.  It's a recolored version of /tg/'s lavaland rock, and modified slightly to look less repetitive.
Ports the lavaland rock tile sprite entirely for future away missions.
Adds tree chopping down feature.  All trees now have health, and hitting it with things will reduce it.  Generally you need something sharp to have a chance of actually felling the tree.
Adds log material, which is obtained from chopping trees.  Hitting these with a sharp weapon converts them into two planks per log.  Can be used to build log walls but otherwise can't be used to craft, at the moment.
Ports /tg/ tree sprites.  Might have a use for them in away missions, who knows.
Makes crystals start anchored and glow.
Shoveling snow checks toolspeed now.
 2017-10-18 12:04:39 -04:00