cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,521 Commits 5 Branches 0 Tags
f6e61ea8f193c61b3d597b6edd2c04fa76b1aad2
Commit Graph

80 Commits

Author SHA1 Message Date
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Novacat
c314578ed3 Merge pull request #8786 from Meghan-Rossi/lathefix 
Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers
 2020-08-21 17:16:44 -04:00
Verkister
929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Meghan-Rossi
470d76db4b Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers 
*Removes some autolathe entries made redundant by https://github.com/VOREStation/VOREStation/pull/8784
*Makes glass carafes and plastic pitchers batch-printable
 2020-08-21 07:58:44 +01:00
Atermonera
4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint 
Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:28:23 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
Rykka
e9ed73f6b5 Makes Pint Metaglasses Printable 
TL;DR Only Virgo and downstreams can print metaglasses, but we never added printing for the pint version.
 2020-08-19 16:52:41 -04:00
Atermonera
6c3273bd20 Merge pull request #7444 from Mechoid/FixAutolatheForging 
Removes the ability to forge plasteel from steel.
 2020-08-12 14:21:01 -04:00
Novacat
088f634374 Update general.dm 2020-08-05 21:13:30 -04:00
Novacat
40c08685d2 Update general.dm 2020-08-05 19:35:33 -04:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
Mechoid
78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
Aronai Sieyes
e9750627aa Add to authpathe 2020-02-20 22:34:22 -05:00
Atermonera
f67866957f Merge pull request #6602 from Heroman3003/legcuffening 
Makes legcuffs printable in hacked autolathe
 2020-01-08 13:48:55 -05:00
Novacat
3ef9dd9b28 Merge pull request #6362 from Ketrai/superqualityforbartenders 
makes glasses mass producable
 2019-12-31 10:22:24 -05:00
Atermonera
45b4947d1e Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers 
Printable Spray Bottles
 2019-12-25 18:10:16 -05:00
Ketrai
e6021d108d makes glasses mass producable 2019-12-22 21:15:29 +01:00
Heroman
3e31046aef Fixes file discrepancy for autolathe ammo recipies 2019-10-14 05:35:30 +10:00
Heroman
b41963d179 Adds vorestation wallconsoles to autolathe 2019-09-24 19:02:05 +10:00
Atermonera
54966826af Merge pull request #6320 from Nalarac/Autolathe 
Allows Multiple Light Printing in Autolathe
 2019-07-22 00:44:30 -04:00
mistyLuminescence
711e807d32 tinytweaks 2019-06-21 17:07:51 -04:00
Novacat
1e5b351f43 Merge pull request #4711 from VOREStation/upstream-merge-5875 
[MIRROR] Tommygun now Tommy Gun
 2019-03-27 20:45:46 -04:00
Spades
b86d6dab13 Tommygun now Tommy Gun (#5875) 
* Tommygun now Tommy Gun

https://github.com/PolarisSS13/Polaris/pull/5837

* Corrects sprite names

I figure this can stay as it is.
 2019-01-22 23:22:23 -05:00
Spades
36c586100a Update general_vr.dm 
Just removes a comment I didn't think we needed anymore.
 2019-01-05 12:58:36 -05:00
TheFurryFeline
a60e466810 Create general_vr.dm 
Adds Holocollar for real to the autolathe specifically for VoreStation.
 2019-01-05 11:26:29 -05:00
TheFurryFeline
b878f1bb89 Reverting for adding to a new file. 
Now to do general_vr.dm
 2019-01-05 10:54:42 -05:00
TheFurryFeline
2da1419155 Holocollar Addition to Autolathe 
Ports from ChompStation an addition to the Autolathe: Holocollars for the ultimate submissives or for the dommies to print for their slave/pets.
 2019-01-02 14:33:07 -05:00
Unknown
8fbd5a5d0a Adds Door Pry, to Ace's specifications 2018-11-24 16:23:17 -05:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	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-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Leshana
7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
 2018-02-17 00:35:29 -05:00
Anewbe
51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804) 
* VARIOUS FISTICUFFS RELATED CODE CHANGES
 2018-02-12 23:17:35 -08:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Bromuzl
6a66b3d773 Correcting typo 556 - -> 545 
The 5.45 machine gun ammo boxes were being named 5.56 because oops.
 2018-01-15 01:49:18 -08:00
Spades
b441ccd6e3 9mm pistol updates (#4480) 
* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
 2018-01-14 14:45:15 -06:00
Mechoid
ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid
5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
 2018-01-04 22:44:04 -05:00
Spades
581f175c27 Fixes shotgun speedloaders in Autolathe 
The name was just wrong. Fixed it.
 2018-01-01 17:54:49 -05:00
killer653
c45ffc9d35 ALL hunter ammo commented out 2017-12-23 21:40:56 -05:00
killer653
e88507b0fe Ace Edits 2017-12-23 13:09:22 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Neerti
9db34eae86 Adds Hunting Rounds 
Adds a system for projectiles to inflict additional damage on specific kinds of simple animals.
Adds special bullets for certain rifles which are very effective against 'animal' SAs such as giant spiders, bears, carp, and such. The bullets do less damage to other targets such as humanoids.
Replaces the southern cross gun locker regular ammo with hunting ammo.
 2017-11-19 23:59:17 -05:00
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
Sabess
c96781499f Allows detectives to take an optional revolver + some other stuff (#4217) 
* I'm like 99% sure this works

* uhm

* accidentally broke something after I tested but before I PRed, fixed now
 2017-11-05 22:53:11 -06:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Spades
6b02206adf Sniper Changes and Fixes 
- Fixes the heavy sniper hand sprite so it no longer looks like a
pistol. Not ideal, but better.
- Changes energy sniper to use the Z8's hand sprite, because it's more
distinct than looking the same as the laser carbine.
- Adds the SVD back by request of Woodrat. It's not spawnable yet, since
I don't know where you want to balance it.
 2017-08-09 21:04:58 -04:00
killer653
fc7d06493c Updates map, updates ammo. 2017-08-06 20:36:37 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Spades
2e776ac645 Changes 5.56mm to 5.45mm, now 20% less stupid 
The same as https://github.com/PolarisSS13/Polaris/pull/3612 except this
time I'm not a dumbass and accidentally overwriting other changes
because the Github client decided not to sync with Polaris.
 2017-07-19 14:24:50 -04:00