cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,235 Commits 8 Branches 0 Tags
fb550da5a2be1d28de59b33c4f7ac6b51e21f001
Commit Graph

889 Commits

Author SHA1 Message Date
Heroman
31d459f230 Fixes Blood-Onator 2019-09-14 15:01:58 +10:00
Unknown
14eb525030 Adjusts Vorestation pills and pillbottles 2019-08-28 04:06:19 -04:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Novacat
dd7a7842ed Merge pull request #5567 from Novacat/nova-survival 
Adds Prototype Hypospray
 2019-08-12 13:15:35 -04:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Novacat
8e321b3725 Update hypospray.dm 2019-08-06 22:10:50 -04:00
Unknown
d7406088b5 Test 2019-08-06 21:07:40 -04:00
Unknown
b5824871ed Removes unnecessary check 2019-08-06 21:05:51 -04:00
Unknown
03976d3dd3 Moves var 2019-08-06 21:03:35 -04:00
Unknown
f699825119 Forgot a Var 2019-08-06 20:58:25 -04:00
Unknown
1fb88e40e2 Adds Prototype Hypospray 
- Can be researched and manufactured by Science
- Identical to a mk1 hypospray, except does not instantly inject reagents at friendly intents

Not terribly useful right now under the current meta, but probably will be useful down the road if/when syringes become disposable again.
 2019-08-06 20:54:14 -04:00
Atermonera
6a12033368 Merge pull request #6321 from Nalarac/patch-2 
Allows Longer Visible Text on Beakers
 2019-07-22 00:44:19 -04:00
GeneriedJenelle
12df030c0a Adds Cider Bottles (#6201) 
* Adds Cider

How has SS13 alcohol gone on so long without cider? Let's fix that.

* Update cartridge_presets.dm

* Update dispenser2_energy.dm

* Update dispenser_presets.dm

* Adds cider bottle sprite + adds to borgs

* Update Chemistry-Reagents-Food-Drinks.dm

* Removes additional cider entry
 2019-06-18 20:05:06 -04:00
Novacat
b7205d3b60 Update pill.dm 2019-06-16 21:51:52 -04:00
Novacat
13739440c2 Grey scale pills and colored pillbottles 2019-06-16 21:28:56 -04:00
Spades
fafd7675ef Merge pull request #4986 from Heroman3003/zoooooooom 
Rebalances zoom pills
 2019-06-12 17:11:48 -04:00
Heroman
2de30ebaf7 Removes fertilizer aspect 2019-06-02 07:09:44 +10:00
Unknown
eeb198d3a4 Metabolism effects 2019-05-02 19:41:17 -04:00
Unknown
fcb2830fe5 Changes adminordrazine pill 2019-05-02 19:34:35 -04:00
Unknown
68649aeb71 Recommended changes 2019-05-02 17:38:26 -04:00
Unknown
1b1489d8cc Adds medicíne pills/bottles for adminbus 2019-05-02 17:08:39 -04:00
Novacat
aac3f800ba Update syringes.dm 2019-04-18 13:53:34 -04:00
Novacat
8e93b70bb6 Update syringes.dm 2019-04-18 13:51:08 -04:00
Novacat
69cc49c009 Conflict Resolution 2019-04-18 13:44:38 -04:00
Atermonera
f986f56ec2 Changes way syringes interact with containers 2019-04-18 13:26:55 -04:00
Heroman
e811fec521 Rebalances zoom pills 2019-04-10 06:14:51 +10:00
Heroman
9e3aa54188 Rebalances zoom pills 2019-04-10 05:12:42 +10:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
mistyLuminescence
5dc4686ad9 Unidentified Auto Tweak 2: Electric Boogaloo (#5990) 
* Remakes #5983 by request.
 2019-03-31 19:19:59 -04:00
Unknown
ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Unknown
b48efb138f More merge conflict fixes 
I think I got them all.
 2018-12-13 00:33:32 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Spades
b28213c906 Merge pull request #4356 from Novacat/nova-ert 
ERT Equipment Redo
 2018-10-20 17:34:41 -04:00
Arokha Sieyes
ce187f64ed Fixup other vorestation things 
Stop using the web editor please
 2018-10-16 12:05:32 -04:00
Anewbe
12e34de332 Move almost everything food related into the kitchen module. 2018-10-15 15:47:14 -04:00
Unknown
7ca817d0c8 I messed up copypasta and forgot to change iron to nutriment 2018-10-12 20:59:29 -04:00
Unknown
3f4039d027 ERT Equipment Redo 
- Removes Light Machine Guns, Grenade Launchers, Matebas, and all 7mm battle and sniper rifles
- Adds 5mm Assault Rifles, .45 revolvers
- Reduces the number of powerful weapon types (energy sniper, combat shotgun)
- Replaces the submachinegun with a weaker one, reduces the number, adds extra magazines
- Adds a lot of things to the medical and engineering ERT sections
- Replaces weapon power cells with self-charging weapon power cells
- Adds a few recharging high capacity power cells (Reskin of slime power cell), and a bunch of hyper capacity power cells
- Adds some miscellaneous devices (Translocator, shelter capsule, binoculars) to the hardsuit section
- Replaces the hardsuit section's grenade launchers with two sprint modules and a micro pharmacy
- Adds LMGs to Zulu's armory
 2018-10-10 19:02:48 -04:00
Spades
d243d80132 Merge pull request #4290 from VOREStation/upstream-merge-5614 
[MIRROR] Hyposprays can now have different sounds
 2018-10-01 09:29:43 -04:00
Spades
b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018 
Polaris Sync 09-27-2018
 2018-10-01 08:43:03 -04:00
Atermonera
ebb89d6c59 Merge pull request #5614 from Anewbe/autospray 
Hyposprays can now have different sounds
 2018-09-30 03:45:40 -04: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