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
47,808 Commits 5 Branches 0 Tags
7fc19250e621a4ed02b3a5cdc79dacf5915ba95a
Commit Graph

94 Commits

Author SHA1 Message Date
Atermonera
7fc19250e6 Merge pull request #6419 from Mechoid/PrinterHREF 
Should solve the I.C. printer HREF exploit.
 2019-08-26 23:33:03 -04:00
Atermonera
e60f0daf47 Merge pull request #6295 from Mechoid/TTS_And_Sign 
Adds an advanced TTS circuit, and sign-camera.
 2019-08-05 18:52:48 -04:00
Anewbe
07811148c3 Merge pull request #6343 from Nalarac/Circuits 
Fixes Integrated Circuit Printer Taking Fractions of a Sheet
 2019-07-27 13:06:42 -04:00
Heroman3003
ca13a8872c MC camera and access fixes and adjustments (#6269) 
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
 2019-07-09 14:01:53 -04:00
Anewbe
7b724d59d5 Merge pull request #6224 from MagmaRam/IC_input_fix 
Fix for some electronics buttons having the wrong label on their pulses.
 2019-06-21 18:26:35 -04:00
Neerti
01fdfe00e6 Fixes some signaler bugs 2019-04-15 18:30:15 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat
cefd175858 Update time.dm 2019-03-28 14:41:14 -04:00
Novacat
09228247c2 Merge branch 'master' into upstream-merge-5897 2019-03-28 14:39:41 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Novacat
1d0bb53293 Merge pull request #4597 from VOREStation/upstream-merge-5786 
[MIRROR] Fixes issue #5788.
 2019-03-27 03:03:40 -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
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Poojawa
8d178972a1 ports #4581 Startup Runtime fix 2019-02-02 06:03:40 -06:00
Poojawa
6f2548e47b Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735 2019-02-02 03:55:21 -06:00
Neerti
81101d30da Fixes some circuit bugs. 2019-01-27 00:48:46 -05:00
Neerti
c1d34ab796 Merge pull request #5786 from avabee/patch-4 
Fixes issue #5788.
 2018-12-18 21:29:50 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
0a77d0d70d Borg, Gripper, and Integrated Circuit interaction update. 2018-12-03 20:22:47 -05: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
Anewbe
8c5562b4bc Fixes some bugs tangentially related to Vox code 2018-09-04 21:36:12 -05:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Anewbe
7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Neerti
96d5f49091 Merge pull request #5445 from Anewbe/memory_circuit_sprite 
Constant Chip has a sprite
 2018-07-27 02:16:47 -04:00
Anewbe
1975326570 Constant Chip has a sprite 2018-07-26 17:36:02 -05:00
avabee
caa8de0541 Fixes a bug with integrated circuit printers. (#5407) 
* Fixes a bug with integrated circuit printers.

This fixes a bug where tools, implants, and presumably (though i have yet to test it) device assemblies cannot be printed from the integrated circuit printer.
This is a much more robust solution for the print-anything bug than the previous one, as it expands the cost to the w_class of objects in it as well as lets you print anything in the current category. (This may be an issue when two people use it at once, but I mean, just learn to take turns or something.)

* closing parenthesis

oops
 2018-07-12 16:17:04 -04:00
avabee
b3cbd77cee Fixes a bug with integrated circuit printers. (#5407) 
* Fixes a bug with integrated circuit printers.

This fixes a bug where tools, implants, and presumably (though i have yet to test it) device assemblies cannot be printed from the integrated circuit printer.
This is a much more robust solution for the print-anything bug than the previous one, as it expands the cost to the w_class of objects in it as well as lets you print anything in the current category. (This may be an issue when two people use it at once, but I mean, just learn to take turns or something.)

* closing parenthesis

oops
 2018-07-12 15:16:09 -05:00
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Anewbe
91edca4434 Recharger refactor 2018-06-14 15:37:22 -05:00
Arokha Sieyes
efe339f40d Fixes IC button label reference in chat messages 
Fixes #3586
 2018-05-06 01:40:30 -04:00
Lorwp
1120e53d36 Destroys Drill meta 
Makes screwdriver hand drills not fit in places a normal screwdriver can
 2018-04-28 20:05:19 +10:00
Arokha Sieyes
3f6ed1cea7 Fixes an exploit with circuit printers 
Allows you to print literally anything.
 2018-04-25 20:47:17 -04:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-05 15:50:13 -05:00
Cameron653
898871e680 Update reagents.dm 2018-01-07 06:05:33 -05:00
Leshana
064f2fe9ca Additional types which need Destroy to return qdel hints (and other Destroy fixes) 2017-12-30 16:02:27 -05:00
Belsima
74aeaaa7ea Fixes circuit icon states. 2017-12-02 09:09:19 -05:00
Neerti
264372ff1a Sanitizes Circuit Inputs 2017-11-17 18:38:48 -05:00
Anewbe
1b6a4597e7 Merge pull request #4246 from MarinaGryphon/IE-Fixes 
Integrated Electronics fixes.
 2017-11-09 21:22:35 -06:00
Marina Gryphon
8b311ac237 Reverted some changes, apparently it was already fixed. 2017-11-08 09:28:29 -06:00
Marina Gryphon
5af691093e Re-fixed an issue with power transmitters. 2017-11-08 09:22:03 -06:00
Marina Gryphon
091c58ec68 Fixed some IE bugs. 2017-11-08 08:33:07 -06:00
arsserpentarium
1a1c10c3f8 circuitry upgrade pt 2 (#4213) 
* 1.All reagent containers are acidproof now and have pin with self reference(to make it more easy to link them)
2.reagent scaner. It's like a beaker. But can give a list of contained reagents.
3.reagent filter. Pump,that can transfer only desired reagents,or all,except unwanted.
4.fuel cell.Converts chemicals to energy.
5.2 pins memory circuit. Sometimes it is very useful.
6.pulse demultiplexers. A lot like regular demultiplexer. But it doesn't distributes data. Just sends pulse to given activator pin.
7.list operations. choose element by index. write element by index. delete element by index search desired element in list. lenght of list.
8.strings: find element in string. explode string by delimeter.

* athsmos sensors back.

* fix
 2017-11-07 22:54:56 -06:00
Dunkhan
c6c015ebbb Added full stops to description text 2017-10-29 20:08:44 +01:00
Dunkhan
ef40c806be Removed trailing list commas 2017-10-29 17:34:21 +01:00
Dunkhan
151e2b8d02 Fixed spelling and capitalisation errors 2017-10-29 15:07:18 +01:00
Dunkhan
2dbbd59888 Added a set of atmospheric analysis sensors to the integrated electronics module 2017-10-29 14:46:14 +01:00