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
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
de09f8ee0b
Merge pull request #14306 from MrStonedOne/patch-114
...
Makes pda cartridges use proper type safety.
2016-01-05 05:21:51 -03:00
3c5cdbefe3
forgot to typecast properly
2016-01-04 23:42:45 -08:00
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
8b08ce8a6b
Better loop
2016-01-04 16:48:11 -06:00
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
777302afa5
Merge pull request #14346 from AnturK/chambutts
...
Restores default chameleon projector disguise
2016-01-04 20:20:59 +01:00
5d86ed49f6
Merge conflic fix
2016-01-03 14:51:14 -08:00
bbaca08f74
Restores default chameleon projector disguise
2016-01-03 19:19:17 +01:00
8a72f5a55c
Fixes cyborg teleport
2016-01-03 04:11:19 -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
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
64fc9ffc4c
Removes some : in cartridge code
2016-01-02 15:14:34 -08:00
45912423df
Makes champrojector use appearance
2016-01-01 21:35:14 +01:00
99f56abe38
Fixes chameleon projector ignoring closets
2016-01-01 21:23:04 +01:00
b381ff2b31
Merge pull request #14132 from KorPhaeron/pda_spaces
...
Fixes PDA formatting
2015-12-30 23:27:28 -03:00
4b78a51361
Wrong place
2015-12-30 19:44:22 -06:00
1fee3c83a6
Span classes
2015-12-30 19:12:56 -06:00
8392974ad0
fixes associative list; adds gas_overlay to "datum gases"
2015-12-29 22:50:09 -06:00
2ccec93fa6
Merge pull request #14131 from Incoming5643/it_wasnt_intentional
...
Fixes High Volume Mode not toggling properly
2015-12-29 22:48:59 -03:00
17f167bcb7
associative list
2015-12-29 13:33:12 -06:00
7cdc7fc4b0
PDA formatting
2015-12-28 19:07:14 -06:00
6296043d85
Fixes High Volume Mode not toggling properly
2015-12-28 19:00:22 -05:00
a64b68f76c
caches gases in more procs
2015-12-28 13:32:49 -06:00
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
6481c95acd
PDA fixes
2015-12-27 10:31:38 -06:00
7b2cd63474
Merge pull request #14022 from Incoming5643/please_don't_merge_unfinished_prs
...
Command headsets being really loud is now a physical toggle
2015-12-25 22:41:47 -03:00
4fab87989b
Removes href value dependency
2015-12-25 19:34:25 -05:00
130a4e0242
Merge pull request #13877 from LanCartwright/thesethingsdontgrowontreesyouknow
...
Removes Bulldogs from roundstart syndicate ship
2015-12-24 22:21:55 -03:00
019f460dc9
Update uplinks.dm
2015-12-25 01:15:49 +00:00
c7d91019ec
final revision
2015-12-25 01:02:29 +00:00
f2cfda71f1
Command headset's being really loud is now a physical toggle on relevant headsets that starts off.
...
The span change for this mode is now just bolding, as what matters is the text looks different, as to stand out in the sea of green. It DOESN'T need to be as big as an attack message.
2015-12-24 19:37:10 -05:00
db23604952
adds 10 more tc to op uplink for total of 30
2015-12-24 18:56:36 +00:00
66ed7605d7
Command Headsets
2015-12-22 09:36:10 -06:00
0397ce0b54
Merge pull request #13848 from AnturK/emplight
...
Fixes emp flashlight firing when storing it
2015-12-21 18:33:03 -03:00
1a7c2a1eca
Fixes emp flashlight firing when storing it
2015-12-20 21:33:29 +01:00
e336acaa33
Voice changer friendly
2015-12-20 11:51:29 -06:00
02d4260cda
megaphone fix
2015-12-19 07:26:44 -06:00
a7ccd084e8
Merge pull request #13734 from KorPhaeron/reinforcements
...
Allows nuke ops to purchase reinforcements
2015-12-18 21:47:01 -03:00
86a983d361
OOP
2015-12-18 17:42:49 -06:00
6f30a11966
Merge pull request #13681 from swankcookie/lantern_sprite
...
Created lantern in-hands
2015-12-17 07:19:30 -06:00
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
ae76b6f3e8
Merge pull request #13530 from AnturK/ninjaawayistoomuchwork
...
Adds Cloaker Belt
2015-12-16 12:00:13 -03:00
916d00c238
Minor fixes
2015-12-16 12:06:09 +01:00
fb85b61f73
Created lantern in-hands
2015-12-15 20:00:58 -06:00
d8a37204e7
Makes burn_state use defines
2015-12-13 05:36:55 -06:00
2c9c4f7a0a
Adds Cloaker Belt
2015-12-11 20:50:09 +01:00
844b10fa33
Whoops I left a debug
2015-12-10 14:42:43 +00:00
acf95ccfd9
Fixes the pAI and removes the .gitignore issue that I caused from other stuff
2015-12-10 14:40:04 +00:00
duncathan
Cheridan
tkdrg
Kyle Spier-Swenson
KorPhaeron
phil235
AnturK
KorPhaeron
Incoming
Incoming5643
LanCartwright
oranges
swankcookie
blah