4aea0db29b
Merge pull request #14120 from duncathan/listmos
...
[READY] Listmos & "Datum Gases"
2016-01-15 11:58:05 +03:00
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
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
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
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
f922fc94f6
Makes the pinpointer actually track the nuking AI
2016-01-11 17:55:16 -08:00
d2d9cd80cd
Removed unused defined proc in APC code.
2016-01-11 11:26:04 -08:00
65367a01b3
I'm a idiot.
2016-01-10 01:39:39 -05:00
135886dcef
Tesla can no longer zap the gateway
2016-01-10 01:25:25 -05:00
f24ff47eba
Alien cooldown
2016-01-09 18:10:39 -06:00
f8d53ef78e
changes abductor guide to current procedure, removes extra message from containment field shocking
2016-01-06 20:40:26 -05:00
1e516a68c7
Merge pull request #14347 from Iamgoofball/patch-143
...
Tesla Nerf (shh dont tell aran)
2016-01-06 12:22:05 -06:00
f9f12f6447
Merge pull request #14261 from KorPhaeron/SMES
...
SMES logging fix
2016-01-05 03:13:30 +01:00
3d74978881
Uses get_turf
2016-01-04 19:40:01 -06:00
797bfe01ef
Merge pull request #14391 from neersighted/tgui_followup
...
Fix tgui proc signatures and thus AI APC reboot
2016-01-04 17:06:52 -06:00
aec6bc103c
Fix tgui proc signatures and thus AI APC reboot
...
This allows state overloading
Make AI reboot code use ui_interact instead of attack_ai
Fixes #13762
2016-01-04 16:25:20 -06:00
c13a2f97e5
Merge pull request #14342 from neersighted/tgui_followup
...
More tgui fixes and tweaks
2016-01-04 18:39:52 -03:00
1b5438851a
Treat assets as binary; fix sizes once and for all
2016-01-03 23:09:14 -06:00
1955b8c2df
Fix a couple typos with the Air Alarm UI
2016-01-03 21:45:57 -06:00
1319bd722d
Clean comments; adata on the serverside; update postcss; APC size
2016-01-03 19:18:55 -06:00
5d86ed49f6
Merge conflic fix
2016-01-03 14:51:14 -08:00
51de33e3c4
haha whoops
2016-01-03 10:24:03 -08:00
d6a3fb42e2
Tesla nerf
...
It no longer bounces shocks nearly as far.
2016-01-03 10:23:24 -08:00
9ee0f50cd9
Merge pull request #14285 from neersighted/tgui_followup
...
tgui followup
2016-01-03 18:00:43 +01:00
1f4017855a
Add window locking system/sanity checks
...
This fixes complaints about windows ending up offscreen or resize
throwing a fit, hopefully
2016-01-03 10:43:03 -06:00
b50e8d2a63
removes a bunch of unneeded spawns
...
spawns have a high overhead.
I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
fd390009c7
Merge pull request #14252 from tkdrg/cablefix
...
Fixes cable_coil children not merging each other
2016-01-03 04:38:52 +03:00
b18c6c2c5c
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
nano/assets/nanoui.js
nano/bower.json
nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
777ba0486d
Rename the tgui pref and adjust all UI sizes for the rewrite
2016-01-01 17:47:45 -06:00
a2bb279164
NanoUI is now 'tgui'
2016-01-01 17:47:44 -06:00
bb152b5c47
Add more complete UIs
...
* Add airlock electronics UI
* Add space heater UI
* Add SMES interface
2016-01-01 17:46:57 -06:00
fc5b78ab87
Attempt to reuse DOM elements in templates
...
Also, remove unused/extra styles to save space (ha ha ha)
2016-01-01 17:45:00 -06:00
81155b74d0
More progress on the Ractive rewrite
...
* Get APCs working under the new system; clean up code
* Auto-update fancy settings; remove README (outdated now); clean Titlebar
* Convert to Stylus; seperate components and such
2016-01-01 17:44:20 -06:00
55ceabae3e
SMES fix
2016-01-01 13:29:11 -06:00
94752caf4a
Fixes cable_coil children not merging each other
...
Fixes #14240
2016-01-01 12:44:04 -03:00
cb27e966eb
Merge pull request #14144 from TheRealGLH/electric_chair
...
Containment fields and electric chairs now use electrocute_act
2015-12-31 19:01:52 -06:00
9cb962cbc1
removes argument that did not need to be specified
2015-12-30 09:34:42 +01:00
17f167bcb7
associative list
2015-12-29 13:33:12 -06:00
034842b901
Fixes tesla
2015-12-29 13:16:33 -06:00
a7865bd9cf
electrocute_act
...
Changes containment field and electric chair effects to use
electrocute_act
2015-12-29 13:36:16 +01:00
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
72830909c6
Merge pull request #13984 from AndrewJacksonThe2nd/teslameme
...
TESLA 4.0: less laggy edition
2015-12-25 14:09:36 -03:00
c5e305c6f1
Merge pull request #13951 from hornygranny/eall
...
fixes tesla engine being called energy eall
2015-12-25 06:37:17 -06:00
f0f18ec6ef
TESLA 4.0: less laggy hopefully
2015-12-24 00:25:00 -08:00
a8b1f8ed70
fixes tesla engine being called energy eall
2015-12-23 00:09:04 -08:00
39b3686726
Adds fingerprint transfer from sing generator to sing.
2015-12-22 20:19:44 -08:00
2aac9a2b1c
SM shard logging
2015-12-21 00:25:25 -06:00
bab0d21e5a
Merge pull request #13759 from KorPhaeron/copyofacopyofacopyofacopyofacopy
...
Merges Malf AI and traitor AI into a single antag type, no longer has its own mode
2015-12-20 16:18:37 -03:00
0d65351d3f
fixes
2015-12-19 17:51:11 -08:00
dabbb02297
Upgrades orbit to use remie's new features, fixes ball movement.
2015-12-19 16:38:32 -08:00
Razharas
tkdrg
duncathan
Shadowlight213
Buggy123
KorPhaeron
MMMiracles
Cheridan
KorPhaeron
Bjorn Neergaard
MrStonedOne
Iamgoofball
TheRealGLH
Martijn Daniels
AndrewJacksonThe2nd
hornygranny