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

1670 Commits

Author SHA1 Message Date
Leshana
93fb3f7865 Call update procs instead of directly setting idle_power_usage or active_power_usage. 
- Adds the update_idle_power_usage() and update_active_power_usage() procs for the respective vars.
- Switches all places modifying those vars directly to call the procs instead.
- This will let us react to the change appropriately, paving the way towards static area power.
- Adds update_power_channel proc for the sake of completeness, but no machines actually modify it so far.
 2020-04-22 20:47:15 -04:00
Atermonera
1e4f5aa80e Merge pull request #7009 from atlantiscze/2020_04_17_EPRFix 
Fixes supermatter monitoring EPR indicator showing Undefined
 2020-04-22 15:48:21 -04:00
Aronai Sieyes
fabf5e630b Merge pull request #7374 from VOREStation/aro-pgenfixes 
Fix some power issues
 2020-04-22 01:45:05 -04:00
Unknown
36bdebef12 Uses original values 2020-04-22 01:25:34 -04:00
Aronai Sieyes
5cfe563b72 Power Fixes 2020-04-22 01:23:58 -04:00
Unknown
8d41fd5782 Fixes broken nuclear reactor sprite 
Again.
Adjusts power numbers
Another tweak
Fixes Portable Generators
200k safe output
This is incredibly dumb
 2020-04-22 00:53:20 -04:00
Aronai Sieyes
d71b127cdb Add micro laser to ARTGs 2020-04-22 00:27:11 -04:00
Killian
e452f3d760 Unique S/H Cell Icons 2020-04-22 04:01:30 +01:00
Killian
d0e317a77c fixes invisible cell types 2020-04-21 21:33:58 +01:00
Aronai Sieyes
ace05634f5 Merge pull request #7354 from VOREStation/aro-tweaks 
Smol Fixes
 2020-04-20 19:39:47 -04:00
Aronai Sieyes
638686039f Re-fix gravity gen icon 2020-04-20 14:21:57 -04:00
Aronai Sieyes
d1cdea22a9 Fix gravy gen area detection happening too early 2020-04-20 13:53:23 -04:00
Aronai Sieyes
f8d387f136 Tweak gravity generator icon 2020-04-20 13:47:36 -04:00
Unknown
c4160b35bb Master Branch Bugfixes 2020-04-20 10:53:34 -04:00
Aronai Sieyes
583472d42e Merge pull request #7343 from VOREStation/aro-gravitygen 
Adds G R A V Y
 2020-04-20 00:21:16 -04:00
Novacat
c8d6d06fee Merge pull request #7335 from VOREStation/aro-paholo 
Swap PA computer to cooler holo computer
 2020-04-19 23:43:22 -04:00
Aronai Sieyes
1d22a745e4 Add Gravity Generator, place on tether, update events 2020-04-19 23:37:10 -04:00
Aronai Sieyes
15fc474520 Portable generators, RTGs, void cores 2020-04-19 21:42:13 -04:00
Aronai Sieyes
82b3ce3036 Swap PA computer to cooler holo computer 2020-04-19 12:47:14 -04:00
SplinterGP
5871399b71 apc revert to old sprite 2020-04-17 19:56:47 -03:00
Repede
fa632c811d Merge branch 'master' into voreupdate 2020-04-17 00:13:39 -04:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
SplinterGP
8228c60f4d Adds new autolathe interface for testing before sending to polaris/virgo 2020-04-16 00:16:52 -03:00
Heroman
b72e727d89 Ports tg cablecoils instead of bay's 2020-04-15 14:38:51 +10:00
Unknown
929df3b1de Merge remote-tracking branch 'VOREStation/master' into nova-pathfinder 2020-04-14 22:23:34 -04:00
Unknown
23e95899a6 Adds nuclear reactor, Fixes 
- Adds Nuclear Reactor, 200 kw safe power, very efficient fuel usage. Emits radiation, should be designed around accordingly.
- Adds Old point defense batteries which use the old sprite.
- Fixes path errors on cruiser.dmm
 2020-04-14 22:10:53 -04:00
Aronai Sieyes
0ee956a2dc Port some power sprites from Bay 2020-04-12 17:48:54 -04:00
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix 
Rewrites the Rewritten Event System
 2020-04-06 16:23:39 -04:00
Aronai Sieyes
965b8c2f94 Various Fox Fixes 2020-04-04 20:20:47 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Atermonera
df77f1bcf2 Port Bay computer icons 2020-04-02 10:30:21 -04:00
Aronai Sieyes
2ea1802f68 Shove APCs and air alarms up on the wall a bit higher 2020-03-24 15:37:39 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Novacat
90e6e1fea2 Update lighting.dm 2020-03-21 16:47:52 -04:00
Atermonera
9f250ce3c9 Emergency lighting 2020-03-21 16:39:36 -04:00
Aronai Sieyes
f946ee065e Remove vorestation edit for APC sprite 2020-03-19 18:44:14 -04:00
Leshana
3e3241eeb2 Make area.gravitychange not require being passed a reference to... itself. (#6838) 2020-03-16 05:32:20 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802) 
* Adds more machine button sounds

* chang
 2020-03-11 20:32:06 -04:00
Aronai Sieyes
1255e1be77 Hybrid shuttle 2020-03-05 23:30:07 -05:00
Aronai Sieyes
6122295f2f Improve SMES icon handling 2020-03-05 23:30:07 -05:00
Aronai Sieyes
c70e974dd0 Powernet cable nodes work on shuttles 2020-03-05 23:30:07 -05:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Atermonera
1d4d3afd45 Merge pull request #6756 from Neerti/lightning_fixes 
Fixes various lightning strike bugs
 2020-02-27 23:58:36 -05:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
6374108fa2 Applies same restrictions as first aid to external synth repair 2020-02-10 18:53:31 -05:00
Shadow
c8901d6155 Resizeation 2020-02-10 17:21:59 -06:00
Shadow
7f4c580d19 Minor Changes 2020-02-09 22:30:18 -06:00