Commit Graph

4216 Commits

Author SHA1 Message Date
Bjorn Neergaard
3ae2397d9f Fix interacting with intercoms as AI 2016-01-19 17:02:59 -06:00
Bjorn Neergaard
1c34479376 Fix uplink code once and for all
Fixes #14733
2016-01-19 16:42:57 -06:00
Bjorn Neergaard
ce36ee73e9 Fix uplink size 2016-01-19 08:41:51 -06:00
Bjorn Neergaard
d87ddf0790 Add parent call, fixing uplink runtime 2016-01-19 08:41:51 -06:00
duncathan salt
1b2ec539af Merge pull request #14708 from xxalpha/aimoduleinstall
Installing laws to an empty AI core will now use install() instead of snowflake.
2016-01-19 07:28:25 -06:00
duncathan salt
f9e35f1695 Merge pull request #14706 from xxalpha/straightouttajacket
Fixes the straightjacket
2016-01-19 07:24:51 -06:00
duncathan salt
ee1067cb5c Merge pull request #14686 from neersighted/mo_tguis
Mo' tgui mo' commits
2016-01-18 14:54:12 -06:00
Bjorn Neergaard
aa8b6bfac2 Factor out radio helpers 2016-01-18 14:30:27 -06:00
Bjorn Neergaard
5cfc60d9da tgui radios; clean up frequency code 2016-01-18 14:28:33 -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
b33c6f216d Tidy tooltips; hide lock button from non-lockable uplinks 2016-01-18 14:27:34 -06:00
Bjorn Neergaard
718639a1c3 Add new syndicate logo
Thanks to @YotaXP
2016-01-18 14:26:28 -06:00
Bjorn Neergaard
4a617062d8 Refactor uplinks; fix up tooltips and make uplink more interactive 2016-01-18 14:25:52 -06:00
Remie Richards
6752d12ee5 Merge pull request #14696 from Razharas/BibleFix
Fixes bible producing unlimited stuff
2016-01-18 20:23:47 +00:00
Bjorn Neergaard
ff5d6292c8 tgui uplinks; repath uplinks 2016-01-18 14:22:00 -06:00
Bjorn Neergaard
1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
xxalpha
8a669c93db Changed aimodule code to use laws datum instead of AI mob. 2016-01-18 03:08:41 +00:00
xxalpha
53b74da4bd Fixes the straightjacket
More straightfixes
2016-01-17 22:12:34 +00:00
Buggy123
4da17c198b Never 2016-01-17 16:07:20 -05:00
Buggy123
84ba5cad1f Added tracking for who last touched the grenade, and corrected grammar. 2016-01-17 14:44:39 -05:00
Razharas
ad1c333e89 Fixes bible producing unlimited stuff
Fixes bible producing unlimited stuff
Fixes https://github.com/tgstation/-tg-station/issues/11298
2016-01-17 20:04:26 +03:00
Buggy123
bed2037840 Adds detonation tracking to grenades. 2016-01-16 21:58:20 -05: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
Cheridan
6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor
Refactor the visible_message() proc to be faster in some cases.
2016-01-09 22:16:57 -06:00
tkdrg
990efcbb7a Merge pull request #14526 from KorPhaeron/virus
Fixes virus grenade kit being empty
2016-01-09 18:40:58 -03:00
KorPhaeron
a35cdae739 Fixes grenade kit as well 2016-01-08 16:03:17 -06:00
KorPhaeron
b6474aa48f virus 2016-01-08 15:58:35 -06:00
tkdrg
6c41d0e437 Merge pull request #14468 from KorPhaeron/fuck_off_already
Stops defibs/cloners notifying suicides when people are trying to revive them
2016-01-08 18:09:29 -03:00
KorPhaeron
1ce90959ef Notify 2016-01-06 22:40:50 -06:00
SouDescolado
783e669c2d Fixes Tuberculosis kit
Name was wrong
2016-01-06 15:52:38 -02:00
SouDescolado
3b257854f0 Merge pull request #1 from tgstation/master
Merge shit
2016-01-05 14:44:37 -02:00
SouDescolado
92b3c84a22 Make the code beautiful
Less lines, same code.

Trying to fix merge conflict.

Gah
2016-01-05 14:36:39 -02:00
tkdrg
de09f8ee0b Merge pull request #14306 from MrStonedOne/patch-114
Makes pda cartridges use proper type safety.
2016-01-05 05:21:51 -03:00
Aranclanos
a9ef05807e Merge pull request #14362 from Bawhoppen/czechbarmanhelp
Gives barman back his new gear
2016-01-05 04:52:21 -03:00
Kyle Spier-Swenson
3c5cdbefe3 forgot to typecast properly 2016-01-04 23:42:45 -08:00
duncathan salt
ede4a3b378 Merge pull request #14335 from KorPhaeron/refunds
Uplink refund refactor/fixes cyborg spawners not appearing in nuke purchase log
2016-01-05 01:11:26 +01:00
Cheridan
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
KorPhaeron
8b08ce8a6b Better loop 2016-01-04 16:48:11 -06:00
Bjorn Neergaard
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
phil235
e225fbc850 - Refactor the visible_message() proc to be much faster.
- Replacing some "for(var/mob/o in viewers()) show_message()" by "visible_message()".
- Replacing some "show_message()" by " << "..." " instead.
- Fixes being able to see the results of the health and slime analyzers while blind.
-
2016-01-04 22:49:27 +01:00
duncathan salt
748e2e3485 Merge pull request #14345 from AnturK/mapjectors
Fixes injectors spawned before mutation table is ready
2016-01-04 20:21:48 +01:00
duncathan salt
777302afa5 Merge pull request #14346 from AnturK/chambutts
Restores default chameleon projector disguise
2016-01-04 20:20:59 +01:00
Lularian
cb50a25772 gives barman his cool stuff again 2016-01-03 19:35:49 -06:00
bawhoppen
3543175c51 Revert "fixes attempt two" 2016-01-03 19:05:52 -06:00
tkdrg
473eb8291e Merge pull request #14216 from Bawhoppen/czechfixes2
fixes attempt two
2016-01-03 21:02:20 -03:00
Lularian
f5bc4b6b4f woops 2016-01-03 17:50:20 -06:00
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
AnturK
bbaca08f74 Restores default chameleon projector disguise 2016-01-03 19:19:17 +01:00
AnturK
ff6d88f4e6 Fixes injectors spawned before mutation table is ready 2016-01-03 18:49:10 +01:00
Razharas
10b74eb793 Merge pull request #14174 from Buggy123/Buggy123-IEDBUFF2
Buffs IEDS 2: electric boogaloo
2016-01-03 13:17:42 +03:00