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

777 Commits

Author SHA1 Message Date
Zuhayr
a7c3c67da8 Fixes #5098 2014-06-01 21:09:30 +09:30
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
UristMcKerman
2bc475ec41 Created new turbine 
Created turbine which inputs from pipes and motor. Also slightly fixed
currently existing turbine (still unbuildable though).
 2014-05-26 12:34:46 +04:00
mwerezak
637f7193fc Fixes circuit var for other consoles 
Also cleans up attackby while we're at it.
 2014-05-22 18:05:57 -04:00
UristMcKerman
9c472415fa Quick fix to TEG 
When one of TEG circulator intakes had gas while the other had no (null)
the air in the first used to be deleted. Fixed this behavior.
 2014-05-20 07:12:28 +04:00
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
 2014-05-14 22:42:03 +01:00
Mike
2d2a145907 Replaces broken generator in eng hard storage 2014-05-14 00:47:01 -04:00
Zuhayr
590f980ea9 Allowed magnetic grippers to remove APC cells. 2014-05-12 14:51:55 +09:30
Zuhayr
3afbae1479 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-11 22:53:37 +09:30
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Zuhayr
582a8e817a Fixes a runtime with drones building lights. 2014-05-11 22:31:27 +09:30
Mloc-Argent
c9a2a4fad0 power: cables show up right on map again 
Cables are red/whatever color on map again instead of white.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-09 18:53:44 +01:00
Zuhayr
1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Mloc-Argent
2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00
Mike
59cb5af50e Updated PACMAN comments. 2014-05-06 16:45:54 -04:00
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Zuhayr
5b32150858 Fixes for previous commit, sigh. 2014-05-03 21:21:19 +09:30
Zuhayr
25c85d6e2a Adding some repair procs to cables and welders for IPC use. 2014-05-03 21:10:26 +09:30
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Ravensdale
45d82c2e00 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/modules/mob/living/say.dm
	maps/tgstation2.dmm
 2014-04-16 22:13:48 -07:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-16 21:44:26 -07:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction 
Fixes some typos and descriptions
 2014-04-09 21:48:19 +04:00
Jarcolr
868dea5681 Grammar patch 1 
This is just the first one of many.
 2014-04-08 14:48:31 +03:00
iamgoofball
238451dbc9 die monkey emergency DIE 2014-04-06 12:05:41 -07:00
Ccomp5950
9d291b79ea Merge pull request #4695 from mwerezak/dev 
Made single cable pieces have w_class = 1
 2014-04-06 00:16:06 -05:00
Mloc
cd23a4b786 Merge pull request #4690 from Glloyd/ear_stuff_2 
A first pass at more realistic w_class values
 2014-04-05 16:23:59 +01:00
Mike
fa1fd3cb24 Made single cable pieces have w_class = 1 
Single cable pieces have w_class = 1 and can be tucked behind the ear.
 2014-04-05 01:21:30 -04:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Mike
353941db7c APCs that are undersupplied now call cell.give() 
APCs that are undersupplied now call cell.give() instead of manipulating
cell.charge directly, for better encapsulation.
 2014-04-02 23:46:54 -04:00
Ccomp5950
6af132b834 APC bugfix after someone messed with mah areas! 
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.

We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.
 2014-04-01 03:06:58 -05:00
Chinsky
9227823e2c Merge pull request #4654 from Ccomp5950/Buff_NarSie 
Lagsie no more, NarSie HUNGERS
 2014-03-31 14:57:43 +04:00
Ccomp5950
bf7684bced Lagsie no more, NarSie HUNGERS 
removed del() calls for objects, now it sets loc to null and removes it from master_controller processing

Much quicker :)
 2014-03-30 03:15:20 -05:00
Chinsky
820b5e0d9b Merge pull request #4632 from Ccomp5950/apc_low_charge_fix 
Bugfix for new APC code, gridchecks won't just turn off equipment.
 2014-03-25 23:12:21 +03:00
Ccomp5950
d6a9448535 Bugfix for new APC code, gridchecks won't just turn off equipment. 
Was a problem with me switching the order of the checks.
 2014-03-24 17:42:27 -05:00
Mloc-Hibernia
dc97a2502a Revert "Merge pull request #4607 from Aryn/master" 
This reverts commit a1fee3e6c3, reversing
changes made to bf4533efde.
 2014-03-24 13:54:11 +00:00
Aryn
7e08bca4ef One runtime fixed, other one didn't turn up. 
I put in some stuff for it to be easier to find if it does.
 2014-03-18 22:12:22 -06:00
Ccomp5950
98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm
 2014-03-18 19:44:19 -05:00
DJSnapshot
044766ef11 quick fix for APCs related to IPC charging. 2014-03-10 15:52:01 -07:00
Chinsky
13b9747504 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-03-10 18:48:12 +04:00
Ccomp5950
541c3ece76 Bugfix: All APC's will have maxcharge of 5,000 
and not be at the whim of lag / how quickly it generates it's cell.
 2014-03-08 05:45:22 -06:00
Ccomp5950
fb04a88774 Removed my debug lines. 2014-03-08 03:55:22 -06:00
Ccomp5950
bb9a66cc3a Effeciency Project: APC / Machinery power usage. 
We no longer run auto_use_power() on every machine every tick.
We now have a global list of areas, and areas that have an APC in them (all_areas and active_areas) no more looping through world bullshit.
A bunch of snowflakey as fuck machines won't use_power() in their process, you get two options, active and idle, use them!
This means a lot of machines won't double dip on power as well so power usage for the station has dropped about 20%

Because everything is snowflakey as fuck we're going to have some machines that don't force an update on their power usage.  Fuck them.
We should catch them with the root obj/machine/proc's forcing updates.
 2014-03-08 03:42:44 -06:00
Ccomp5950
e0e1bd9cfb APC Area update initial commit. 2014-03-07 23:42:28 -06:00
Ccomp5950
74a8fa152c APC overlay bugfix. 
Before: If you turned off the breaker and fiddled with on/off states and turned on the breaker it wouldn't update the overlay because the check_updates wasn't doing an if(operating) check and would think it didn't need to update the overlays once you turned on the breaker.

After: Check_update() is doing a check for the breaker being on or off and taking that into account with the update_overlay flags and will update the overlays properly.

Thanks Razharas from /tg/ #coderbus for bringing this to my attention.
 2014-03-04 20:57:40 -06:00
DJSnapshot
acdbb3573a Changed supermatter messages to reflect what they actually mean. 2014-02-28 15:28:11 -08:00
Ccomp5950
63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm
 2014-02-20 19:16:23 -06:00
Ccomp5950
9c5f96cc58 Code effeciency project: apc update_icons 
Before:  It updated the icons quite a bit at the start of the game.

After:  It updates more often and quicker, but now it isn't as expensive
 2014-02-16 10:59:19 -06:00