cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-13 10:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,721 Commits 8 Branches 0 Tags
cd0e5fd00a470398cc2edc92e2328581dca457fe
Commit Graph

310 Commits

Author SHA1 Message Date
Razgriz
6c1509c0ad powder that makes you say yes 2022-10-02 22:03:08 -07:00
Casey
f6708d3687 Adds in 'compliance implant' 2022-10-02 17:58:42 +00:00
Razgriz
efc83a4860 Re-add slavic language (#4729) 
* Re-add slavic language

Don'tn't.

* Slavic

* Slavic

* Slavic

* Slavic
 2022-08-17 22:50:13 -07:00
Casey
b4dae2dca6 Condenses all the animal languages and deletes unused/unwanted languages 2022-08-14 05:44:51 +00:00
Casey
27b89fc164 Merge pull request #13278 from Heroman3003/implanter-fix 
Fixes implanter implant teleportation
 2022-07-08 00:30:06 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
d4c693378d Merge pull request #12210 from VOREStation/upstream-merge-8200 
[MIRROR] Cybernetic Augments and Sick Tats
 2022-02-13 21:48:53 +00:00
Nadyr
bb0392740f powder that makes you say yes 2021-12-12 04:23:10 -05:00
Aronai Sieyes
4b2fa3836d Adds Altevian Language & ATC Fluff 2021-12-10 01:46:15 +00:00
Anthony Rodriguez
15dd652d8b Updating to reflect proper CHOMPEdit and nesting 2021-08-30 18:19:30 -07:00
Anthony Rodriguez
be2e0a0609 Altevian & Squeakish Language and ATC Addition. 2021-08-30 14:52:43 -07:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Aronai Sieyes
27545a7859 Merge pull request #11010 from VOREStation/Arokha/qpadlink 
Fix some bugs
 2021-07-10 20:12:23 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels 
Various qdel helpers
 2021-05-20 19:05:42 +00:00
Novacat
4631c4faca Merge pull request #9897 from VOREStation/upstream-merge-7963 
[MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-10 19:40:33 +00:00
Novacat
955be2e5fe Merge pull request #9876 from VOREStation/upstream-merge-7953 
[MIRROR] Fixed/generalized loadout implants.
 2021-03-08 16:53:20 +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
cadyn
23181d86db egg laying shenanigans go from local into object. 
reeeeee
 2021-01-15 14:59:52 -08:00
LunarFleet
aaa61d6377 Makes cascading toggleable 2020-11-02 23:46:52 -05:00
LunarFleet
bd1503a35d Realized I could touch up the interactions a bit 2020-10-15 23:37:26 -04:00
LunarFleet
163dc56069 Only eggs can sustain me 2020-10-15 20:34:13 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
ShadowLarkens
f905cfc020 Ported /tg/ style screen alerts, replacing the hunger icon with them 
This adds throw_alert() and /obj/screen/alert, a system that allows you
to do custom hud alerts for any variety of things from "You're too
cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. The
xenochimera feral indicator would probably be a good candidate for
conversion, but I didn't touch it in this PR. There's also a number of
new alerts, such as blindness, highness, legcuffed, buckled, handcuffed,
and probably some more I missed; read code/_onclick/hud/alert.dm and see
for yourself!

Additionally, a number of tweaks have been done to resisting code, to
make it so that there's an indicator when you're buckled or handcuffed,
and can just click the alert to start resisting. This includes a
refactor that combines the logic for lockers, holders, micros
escaping from shoes, and struggling in a gut all into one proc, called
container_resist(). This means that vore bellies actually no longer need
the resist override, but it's been left in place just in case someone
finds something else they want to use it for.

Also, the health and internals indicator got moved down one tile each.
Needed room for the alerts. If we add the oxygen tank action buttons
from /tg/ and remove the internals indicator, the health indicator can
go back where it was originally.
 2020-05-13 19:36:01 -07:00
Aronai Sieyes
1688e16d88 VS: Get your clicks out of my movement code 2020-04-30 15:41:26 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045 
[MIRROR] Removes limits on eating, centralizes nutrition changing.
 2020-04-29 19:23:55 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
ShadowLarkens
1d655268a4 Fixed merge conflicts and errors, everything seems to work 2020-04-23 18:25:25 -07:00
ShadowLarkens
139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Anewbe
d7c0195212 Merge pull request #6500 from KasparoVy/you_tracking_implanted_the_floor 
Loadout Implants Properly go in Mob, not on Floor
 2019-10-29 20:34:36 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Unknown
10f290106c Ports pan-slavic from Baystation 2019-09-18 15:57:30 -04:00
Zap-zapper
acc9897320 Size control implant fix 2019-04-13 18:42:53 +07:00
Unknown
6636f1ba37 Conflict Resolution Part 2 2019-03-27 15:51:05 -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
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Spades
8c1b8aacb2 Merge pull request #4550 from Zap-zapper/size-im 
Size control implant
 2019-01-04 23:59:17 -05:00
Zap-zapper
e7ae902098 Moving code from normal files to lewd files 2018-12-09 09:47:07 +07:00
Zap-zapper
3b2258ce38 size control implant 2018-12-08 17:12:33 +07:00
Verkister
c1536879b2 Fixes some implant related issues. 
-Fixes reagent implants being utterly bricked.
-Fixes backup implants not showing up in AR huds.
-Both issues were caused by implants now going way deeper into the bodyparts than before.
 2018-12-05 17:47:19 +02:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -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
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549) 
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
 2018-09-12 20:51:32 -05:00