coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29,886 Commits 9 Branches 11 Tags
289f0c19e1014096ee2d00e8bf17c007f8f5922f
Commit Graph

1051 Commits

Author SHA1 Message Date
xxalpha 68dedb9ee2 Reverts #15187 2016-02-05 01:28:44 +00:00
xxalpha 3316070ac0 Merge remote-tracking branch 'upstream/master' into putin 2016-02-05 01:27:26 +00:00
xxalpha cdef1324d3 Fixes var edited SMES starting with no charge. 2016-02-04 08:52:26 +00:00
KorPhaeron 8d4351fd04 Revert "Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue" 2016-02-03 22:03:22 -06:00
Razharas 6dd29e1211 Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue 
Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
 2016-02-02 01:02:17 +03:00
tkdrg a0f7d7afe1 Merge pull request #14999 from KorPhaeron/AI_buffs 
AI upgrade software
 2016-01-30 10:50:05 -03:00
Razharas 0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs 
Absolute paths and changes one liner if's/else's/else if's.
 2016-01-29 03:15:12 +03:00
Bjorn Neergaard f93822c195 Allow tgui input() to be 0, fix SMES components 
Fixes #14965
 2016-01-28 07:10:37 -06:00
KorPhaeron 00f84f74ea AI upgrade software 2016-01-28 00:44:45 -06:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard d9162b653c Fix tgui recursion being broken 
..() is more elegant after all... You win @RemieRichards
Fixes #14925
 2016-01-27 00:52:22 -06:00
Razharas d110b5fc59 Merge pull request #14882 from ChangelingRain/superfailed 
Actually fixes supermatter explosion to not be capped
 2016-01-27 04:16:20 +03:00
Bjorn Neergaard 961eeea661 Rewrite SSUs, tweak newly added UIs 2016-01-25 12:03:07 -06:00
Bjorn Neergaard c78e1ec2ac Fix a lot of wire interactions 2016-01-25 12:03:03 -06:00
Nerd Lord 8131d9e5b1 i forgot what to set the var to between looking at the proc and looking back at supermatter 2016-01-24 22:33:16 -05:00
tkdrg dc0e8f7b5c Merge pull request #14817 from duncathan/lastmos 
Adds mapping freedom to the TEG
 2016-01-24 15:15:48 -03:00
duncathan salt 14befdc1e8 Merge pull request #14807 from Razharas/UltimateFix 
For real fixes smeses charge on construction
 2016-01-24 10:07:00 -06:00
Razharas b9eacbaf4a Merge pull request #14794 from ChangelingRain/superbombing 
Fixes supermatter explosion being capped
 2016-01-24 16:54:40 +03:00
duncathan 143352e506 fucking birdboat 2016-01-23 13:14:07 -06:00
duncathan 07bb3775e6 adds mapping freedom to the TEG 2016-01-23 12:25:42 -06:00
Razharas d6ddcf6b4c For real fixes smeses charge on construction 
For real fixes smeses charge on construction
Fixes https://github.com/tgstation/-tg-station/issues/14806
 2016-01-23 18:17:01 +03:00
Bjorn Neergaard 7c7d35f204 Fix colon cancer 2016-01-22 20:18:01 -06:00
Bjorn Neergaard 1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Bjorn Neergaard b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
Bjorn Neergaard 87b0857b93 Refactor wire datums 
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
 2016-01-22 19:22:09 -06:00
Nerd Lord b92c159dee Fixes supermatter explosion being capped 2016-01-22 20:06:12 -05:00
tkdrg 14f90d8f1e Merge pull request #14748 from xxalpha/airlocktiming 
Changed APC wire pulsing and airlock autoclose() to use timers.
 2016-01-22 21:36:56 -03:00
Razharas 4244d67b1c Makes SMES great again 
Makes SMES great again
 2016-01-21 00:31:04 +03:00
xxalpha de44d7ec43 Changed APC wire pulsing and airlock autoclose() to use timers. 
a

round
 2016-01-20 21:26:44 +00:00
Razharas 247505d448 Final solution to the Mean() question 
Final solution to the Mean() question
 2016-01-20 01:03:20 +03:00
Firecage d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
Bjorn Neergaard 41caa93330 Hotfix for display issues and UIs droping ui_act calls 2016-01-18 17:00:15 -06:00
Bjorn Neergaard a1ff8e8783 Refactor tgui interactions 
Removes a lot of duplicated code, thanks to @nullquery's parent tweaks
 2016-01-18 14:27:56 -06:00
Bjorn Neergaard 1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
Bjorn Neergaard 0a7236d955 Allow relabeling any canister; port MULEbot to tgui 2016-01-18 14:21:56 -06:00
Razharas afccde250c Further corrections to smeses 
Further corrections to smeses
 2016-01-18 17:10:35 +03:00
Razharas c71c01f4e9 Roundstart smes fix 
Roundstart smes fix
 2016-01-18 17:00:30 +03:00
tkdrg ace569e951 Merge pull request #14678 from Buggy123/patch-9 
Fixes energy ball Destroy()
 2016-01-17 22:05:03 -03:00
Firecage 0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
duncathan salt 24784b8283 Merge pull request #14666 from Razharas/SMESfix 
Makes SMES drain cells on deconstruction
 2016-01-17 10:07:16 -06:00
Buggy123 52879ba052 Fixes energy ball Destroy() 2016-01-16 19:00:39 -05:00
Firecage 754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
Razharas 36f0daa071 Makes SMES drain cells on deconstruction 
Makes SMES drain cells on deconstruction
Fixes https://github.com/tgstation/-tg-station/issues/6451
 2016-01-16 19:38:35 +03:00
Nerd Lord 3f2bcdb25b Fixes an old as fuck bug where the malfhack var wasn't set on APCs hacked by malf AIs. 2016-01-15 23:55:51 -05:00
Razharas 4aea0db29b Merge pull request #14120 from duncathan/listmos 
[READY] Listmos & "Datum Gases"
 2016-01-15 11:58:05 +03:00
tkdrg 79ece99a92 Merge pull request #14592 from Shadowlight213/Perfectpointer 
[s]Makes the pinpointer actually track the nuking AI.
 2016-01-14 18:22:47 -03:00
duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
Shadowlight213 f056cb5ae6 Made malf pinpointer tracking use curated list instead of world. Also used ai_list instead of player list 2016-01-13 15:07:32 -08:00
tkdrg fd2078fea2 Merge pull request #14554 from Buggy123/Buggy123-teslagateway-fix 
The Goofball no longer deletes parts of the gateway
 2016-01-12 16:22:47 -03:00
Shadowlight213 f922fc94f6 Makes the pinpointer actually track the nuking AI 2016-01-11 17:55:16 -08:00