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
63,759 Commits 5 Branches 0 Tags
f6bcad07df1a585a398be3cc039c8e829756926f
Commit Graph

91 Commits

Author SHA1 Message Date
Chompstation Bot
a06e872c51 Tweak synth stuff 2021-05-11 22:04:18 +00:00
Nadyr
0f2b8e57a4 Merge pull request #1880 from CHOMPStationBot/upstream-merge-10248 
[MIRROR] [MIRROR] Swaps emote(me) out for custom_emote().
 2021-05-09 07:39:11 -04:00
Chompstation Bot
ca996648dd [MIRROR] Oops, I refactored Chemistry! 2021-05-08 23:59:34 -04:00
Novacat
0292d2071c Merge pull request #10248 from VOREStation/upstream-merge-8058 
[MIRROR] Swaps emote(me) out for custom_emote().
 2021-05-05 18:45:19 +00:00
Nadyr
a66d37daee Merge pull request #1453 from CHOMPStationBot/upstream-merge-9814 
[MIRROR] [MIRROR] Adds the Restraining Bolt.
 2021-03-04 03:53:12 -05:00
Novacat
5be7ddc486 Merge pull request #9837 from Novacat/nova-pathfinder 
Earlyports Stair fix from Polaris
 2021-03-02 22:28:01 +00:00
Novacat
7f7c5873d6 Merge pull request #9814 from VOREStation/upstream-merge-7820 
[MIRROR] Adds the Restraining Bolt.
 2021-02-28 23:16:43 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
15f5770983 Merge pull request #9724 from Novacat/nova-basicfixes 
Earlyports Polaris Fixes
 2021-02-15 22:48:27 +00:00
cadyn
2fe77a59ac Revert "fixing defib timer and adding surgery for that shit" 2021-01-24 22:46:10 -08:00
Cadyn
4156dd8085 fixing defib timer and adding surgery for that shit 2021-01-24 21:27:44 -08:00
cadyn
5bbdccefa5 Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended." 2021-01-24 18:53:16 -08:00
Novacat
57e1be6caa Merge pull request #9598 from Heroman3003/defibfix 
Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:34:15 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
fd563559ad Merge pull request #9077 from VOREStation/upstream-merge-7668 
[MIRROR] Actually commit the reagent cycler's entire gimmick.
 2020-09-21 14:06:14 -04:00
Atermonera
d0fd1df327 Merge pull request #7668 from Mechoid/ReagentCyclingCycler 
Actually commit the reagent cycler's entire gimmick.
 2020-09-21 12:48:24 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
Cyantime
78ec7a7733 Fix promethean revival flavor text and OOC notes 2020-08-05 05:26:03 -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
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Neerti
e89fef965e QoL: Stasis and Defibs 2020-04-07 00:39:35 -04:00
Novacat
702ccbee5c Update lungs.dm 2020-03-27 08:39:57 -04:00
Atermonera
c49c1e40f3 Fix runtimes in lungs.dm 2020-03-27 03:18:28 -04:00
Arokha Sieyes
34a9cd4561 Fix stupid lung runtime 2020-03-27 00:41:36 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
560a24ee83 Merge pull request #6637 from Mechoid/AugmentsRespectBeds 
Augments Respect Beds, Robotic
 2020-01-25 22:14:02 -05:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
TheFurryFeline
2754068163 More Fixes 
Brollies, T-comms access fix, body designer, Erik's Lungs
 2019-12-31 20:03:39 -05:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Novacat
5e7735a807 Update brain.dm 2019-10-22 21:14:26 -04:00
Unknown
6333e7ab72 Ports Polaris #6492 
Fixes a divide by zero issue with brain damage and pulse.
 2019-10-22 21:13:25 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Anewbe
50ff14f8f8 Merge pull request #6079 from Mechoid/AugmentPreWork 
Augment Work
 2019-06-16 20:58:32 -04:00
Atermonera
30726b47d6 Starts work on Organs affecting Reagent Processing 2019-04-18 13:09:48 -04:00
Neerti
fd4dc97a8b Merge pull request #6048 from Heroman3003/promcore-decay-fix 
Fixes promethean cores decaying pointlessly
 2019-04-08 12:02:19 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Screemonster
5644ee00fd forgot to mark edit 2018-10-10 22:17:20 +01:00
Screemonster
b34714684a gives prommie cores an icon 2018-10-10 13:48:22 +01: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
Mechoid
31761714b2 Adds a Neural implant for future implementation. Promethean brains have been updated to fit it. 2018-08-28 01:23:36 -07:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Anewbe
8f9e817bf0 Language and Larynx Additions (#5402) 
* Various Language Improvements
 2018-07-13 21:13:47 -07:00