cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,918 Commits 8 Branches 0 Tags
014729a001b51af3a665684fbe68a3c3e3489ef1
Commit Graph

777 Commits

Author SHA1 Message Date
Walter0o
71d130e52b fixes #6046 2014-08-20 13:18:13 +02:00
Ccomp5950
770fb4de4c Merge pull request #6052 from PsiOmegaDelta/Mapping 
Fixes #6027
 2014-08-19 12:01:14 -05:00
Ccomp5950
3c19520df2 Merge pull request #6059 from mwerezak/power-net 
Fixes APCs eating up all the power even when fully charged
 2014-08-19 06:02:34 -05:00
mwerezak
c42d9171d6 Makes power monitor a power machine again 
Also moved the power monitor code to modules/power
 2014-08-19 01:45:23 -04:00
mwerezak
1cfc3b8d5f Fixes APCs eating up all the power even when fully charged 2014-08-19 01:14:18 -04:00
PsiOmega
11ce777d9c Fixes #6027 
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
 2014-08-18 22:37:54 +02:00
Walter0o
9421b4b48e fixes #5964 2014-08-13 03:38:41 +02:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
mwerezak
e1dc7d436b Fixes icons and other things not updating when the master controller updates power status. 
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
 2014-08-10 03:45:20 -04:00
mwerezak
4b070a2de6 Fixes #5935 
Also improves apc/process() (doesnt add and then remove charge from
cells when it doesn't have to).
 2014-08-10 03:44:56 -04:00
mwerezak
213b11601e Updates emitters and containment field power usage 
As well as PA power usage. It's not used at the moment, but it might be
used by downstream or in the future.
 2014-08-10 00:40:58 -04:00
mwerezak
b529d582e5 Fixes siemens_coefficent not affecting shock damage 
Also cleans up electrocute_act()
 2014-07-31 15:20:45 -04:00
mwerezak
bf0a17dcb0 Fixes NOPOWER not updating when machines are moved 2014-07-28 18:52:13 -04:00
mwerezak
cd1ed034a8 Adds power net profiling verbs 2014-07-27 19:59:02 -04:00
mwerezak
cb413454a3 Optimizes atmos machine power updates 
Makes power usage but atmos machinery less accurate but reduces lag
somewhat.
 2014-07-27 03:35:25 -04:00
mwerezak
79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net 
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm
 2014-07-24 16:04:41 -04:00
Mloc-Argent
d5e9851b62 integrate XGM into the code 
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-22 19:52:12 +01:00
mwerezak
c46904a3b6 Merge remote-tracking branch 'upstream/dev' into power-net 
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/pipes.dm
 2014-07-18 15:02:07 -04:00
Chinsky
9e0569cfb9 Merge pull request #5631 from PsiOmegaDelta/Engine 
Remote-controlled emitters
 2014-07-17 15:42:03 +04:00
Zuhayr
ea8cdb52c7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:59:45 +09:30
Atlantiscze
386b1e6ce4 Bugfix - cable coil now shows correct transferred amount. 2014-07-16 22:59:14 +02:00
mwerezak
5ca36fcadb Merge branch 'dev' into power-net 
Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl
 2014-07-16 16:14:52 -04:00
Zuhayr
f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
PsiOmega
08e13c7d46 Merge branch 'dev' into Engine 2014-07-15 21:31:53 +02:00
PsiOmega
0bb878d198 Makes it possible to activate emitters using control buttons. 2014-07-15 21:16:27 +02:00
mwerezak
f5c67f87ab Fixes chargers being a magical source of charge 2014-07-12 15:44:21 -04:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
Walter0o
0ff5d021de fixes #5449 
missing variable updating lead to APCs stuck in green status during powersinks.
 2014-07-10 18:21:00 +02:00
Chinsky
8c67326576 Merge pull request #5331 from UristMcKerman/pipeturbine 
Pipe Turbine
 2014-06-24 13:08:11 +04:00
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
Mloc
8ca382f362 Merge pull request #5338 from Loganbacca/devfix 
Fixes incorrect cable coil colours
 2014-06-23 14:02:46 +01:00
Zuhayr
a6f64ccd9c Merge pull request #5330 from mwerezak/emergency-shuttle 
Updates emergency shuttle controller to use shuttle datums
 2014-06-23 21:19:36 +09:30
Loganbacca
d1a729f5db Fixes incorrect cable coil colours 2014-06-23 21:44:51 +12:00
mwerezak
dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10:56 -04:00
mwerezak
37e63dfcb0 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().
 2014-06-22 00:13:22 -04:00
Ccomp5950
68d01b00ab Merge pull request #5297 from comma/fancy 
Nextgen lights
 2014-06-20 20:30:11 -05:00
Chinsky
2396c6d882 Nextgen lighting #2: Lights 
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
 2014-06-18 20:38:33 +04:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
mwerezak
6dee9cf65d Adds sharp and edge flags to appropriate items 
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
 2014-06-16 13:26:44 -04:00
igalan
9a27556421 Let's test this rebase thing. 2014-06-14 15:20:25 +01:00
Chinsky
6d432d8e9d Merge pull request #5219 from Zuhayr/autolathe 
Autolathe rewrite.
 2014-06-12 20:28:44 +04:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup 
Cleans up get_turf_loc()
 2014-06-12 18:13:01 +09:30
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf() 
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
 2014-06-10 13:43:11 -04:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Zuhayr
c3c6f72147 More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron. 2014-06-08 01:39:49 +09:30
igalan
d16f3bb743 -Fixed: Trying to build a terminal without enough cables would leave SMES bugged out until VV'ed. 
-Made maximum input and output values depend on a variable instead of a define directly. For VV or future customizable SMESes.
-Made reattempting to charge a bit smoother.
-ion_act()'s explosion is now logged.

And that's it. It's just a 30something lines commit, geez.
 2014-06-03 17:35:14 +01:00
igalan
2eae518ea2 Nitpickity addressed: Added span classes. 2014-06-02 21:58:06 +01:00
igalan
64e56aaa20 Made SMES terminals able to be constructed and deconstructed. 
Way to do:
-Open maintenance hatch with screwdriver.
-Apply cables (at least 10)/wirecutter.

Code is modified and corrected /vg/ code.
 2014-06-02 12:13:26 +01:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30