PsiOmega
957ff8314d
Cargo can now order empty blood packs.
2014-11-30 16:45:52 +01:00
mwerezak
76e0eb8504
Adjusts captain announcement whistle sound
...
Greatly shortens the length of the whistle sound by cutting out most of
the uniform early part, and reduces volume slightly.
2014-11-30 10:30:05 -05:00
Zuhayr
0903bd7fc5
Working on some suit bugs, attempted to fix the welding overlay issue with no success.
2014-12-01 01:51:52 +10:30
PsiOmega
e7fdf58f7f
Fixes #7191
...
Corrects broken id-tag.
2014-11-30 16:00:13 +01:00
PsiOmega
493465453e
Turret controls now affects all aspects of slaved turrets.
2014-11-30 15:50:51 +01:00
PsiOmega
8857365c1c
Fixes exploit that lets AIs use machinery even after cameras are disabled.
2014-11-30 15:24:39 +01:00
Zuhayr
14cf4aa8e3
Refactored mag grippers a bit. Kinda hate myself for writing them the way I did, but hindsight etc
2014-12-01 00:37:13 +10:30
Zuhayr
9b5235016b
Set the hazmat rig to use the medical rig icon for now. Woo placeholder sprites.
2014-11-30 23:50:54 +10:30
Zuhayr
3a312b4a03
Fixes #7179
2014-11-30 23:49:55 +10:30
Zuhayr
a5ee32d4ca
Fixes some colour macros, removes inactive jetpack icon for rigs.
2014-11-30 23:47:34 +10:30
Zuhayr
7703b0f4c0
Fixes #7186
2014-11-30 23:47:12 +10:30
Zuhayr
018eb4cb60
Fixes #7187
2014-11-30 23:46:36 +10:30
PsiOmega
c6673bea70
Minor Map Stuff
...
Moves the atmospherics powernet sensor into the small maintenance room. Looked a bit odd on-top of the floor.
Adds some lights to the new maintenance arm between xeno/viro.
Shuffle some maintenance lights around.
Sorts out a dimly lit room on the research outpost.
2014-11-30 12:39:52 +01:00
PsiOmega
0731badf87
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/modules/power/smes.dm
code/modules/power/smes_construction.dm
maps/tgstation2.dmm
2014-11-30 10:54:15 +01:00
Chinsky
1ac4b90368
Merge pull request #7161 from PsiOmegaDelta/MapReaderFixes
...
Fixes Map Loader issues.
2014-11-30 12:51:21 +03:00
Chinsky
7d630f952f
Merge pull request #7155 from PsiOmegaDelta/XenoHUD
...
Xenobiology SecHUD icon
2014-11-30 12:50:54 +03:00
Chinsky
dbf69cba81
Merge pull request #7154 from PsiOmegaDelta/SneakyPersonalAIs
...
pAIs can now hide.
2014-11-30 12:50:44 +03:00
Chinsky
c0e54f23cf
Merge pull request #7152 from PsiOmegaDelta/RoboCircuit
...
Robo circuit
2014-11-30 12:50:36 +03:00
Chinsky
27736e5ce3
Merge pull request #7137 from atlantiscze/buildable-smes-fix
...
Buildable smes minor changes
2014-11-30 12:50:19 +03:00
Chinsky
edede8ad34
Merge pull request #7153 from PsiOmegaDelta/BeaconBanCheck
...
Syndicate Beacons no longer attempt to convert traitor banned players.
2014-11-30 12:50:12 +03:00
PsiOmega
5e34d12877
Merge remote-tracking branch 'upstream/dev' into RoboCircuit
...
Conflicts:
code/modules/mob/living/carbon/brain/posibrain.dm
maps/exodus-1.dmm
2014-11-30 10:47:36 +01:00
PsiOmegaDelta
0454c7d028
Merge pull request #7167 from atlantiscze/nice-atmos
...
Map Changes
2014-11-30 09:43:33 +01:00
Zuhayr
4c1ea8cd3a
Several hardsuit fixes.
2014-11-30 12:46:03 +10:30
Zuhayr
c7973e0ab2
Made suit boots children of magboots.
2014-11-30 11:12:15 +10:30
Zuhayr
1500dbd505
Fixes #7128
2014-11-30 10:52:35 +10:30
Amunak
5a8a9c2816
Supermatter warning now has its own proc. Fixed some SM bugs.
...
Added logging for when SM explodes. The delay of regular warning was made *higher* (from 15 to 20 seconds) because of a bug; Delay of the emergency warning was lowered (from 30 to approx. 12 seconds). The announcement of 'returning to safe levels' now happens only once. The spawn .. explosion and irradiation and hallucinations are now also applied only once (which means they may need some tweaking, but I have no idea if they stacked anyway; mainly the code should now be much more efficient).
2014-11-30 00:23:55 +01:00
Amunak
45b314bd60
Moved shard to the bottom of the file, tweaked its values.
...
Also added the time between delamination and actual explosion (pull time) as a separate val and lowered it for the shard.
2014-11-30 00:16:54 +01:00
Amunak
889442ef93
Supermatter code formatting
2014-11-30 00:07:54 +01:00
Atlantiscze
0b414ca3db
Merge remote-tracking branch 'origin/dev' into nice-atmos
...
Had some strange merge problems. This may have broken something. Visual map inspection however shows no problems.
2014-11-29 23:51:07 +01:00
Chinsky
8cdd094e1b
Merge pull request #7156 from PsiOmegaDelta/RadioFix
...
Radio fixes
2014-11-30 00:56:53 +03:00
Chinsky
079b35c158
Merge pull request #7163 from PsiOmegaDelta/Cactii
...
Fixes #6165 .
2014-11-30 00:56:46 +03:00
Chinsky
366badb706
Merge pull request #7165 from PsiOmegaDelta/Joining
...
Late-Join Name Addition.
2014-11-30 00:56:42 +03:00
Chinsky
99cf1ee8f5
Merge pull request #7166 from PsiOmegaDelta/TurfClick
...
Fixes AIs seeing runes in the Alt+Click panel
2014-11-30 00:56:25 +03:00
Chinsky
79562c8f27
Merge pull request #7168 from atlantiscze/syndie-shuttle-docking
...
Nukeops shuttle docking
2014-11-30 00:56:22 +03:00
Chinsky
8729781d4b
Merge pull request #7170 from Loganbacca/bayfix
...
Grass seed runtime fix
2014-11-30 00:56:19 +03:00
Chinsky
feaebecd04
Merge pull request #7173 from MrSnapwalk/angelangles
...
Adds Atlantiscze's custom borg and AI sprites.
2014-11-30 00:56:15 +03:00
MrSnapwalk
c88042ae4b
Adds Atlantiscze's custom borg and AI sprites.
2014-11-29 14:47:43 -06:00
Neerti
9cf2b467b9
Fixes the 'drone' sprite for borgs. The eyes are now actual eye sprites instead of attached to the base sprite. No more pumping 40 shots into a secborg and wondering why it won't die.
...
Adds option for medical module to use the medical drone sprite.
Adds sprite for surgery and mining. Mining will no longer use a medical sprite (why???)
2014-11-29 14:49:08 -05:00
Amunak
cc576db683
Fixed compile error because I don't know how istype() works
2014-11-29 20:33:37 +01:00
Amunak
309cf59f71
Supermatter shards now don't announce anything
2014-11-29 19:59:06 +01:00
Atlantiscze
914a778254
Fixes one missing pipe segment between Virology and Xenobio i somehow forgot to map in before.
2014-11-29 16:25:35 +01:00
PsiOmegaDelta
1780b9904f
Merge pull request #7164 from Amunak/chat-shenanigans
...
Mostly chat-related improvements, mainly adding chattags (icons) to important channels
2014-11-29 16:07:35 +01:00
Loganbacca
7a94f30da2
Grass seed runtime fix
...
Fixes grass seeds causing a runtime when putting a stack through the seed extractor with only 1 tile left in the stack.
2014-11-30 00:11:47 +13:00
PsiOmega
0f8156e77e
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/objects/structures.dm
code/game/objects/structures/inflatable.dm
2014-11-29 10:09:03 +01:00
PsiOmegaDelta
6b50ada69b
Merge pull request #7159 from mwerezak/logo
...
Fixes broken [logo] tag
2014-11-29 09:49:10 +01:00
PsiOmegaDelta
2899bb31af
Merge pull request #7157 from Neerti/11_27_04_borginventory_quickfix
...
Fixes potential problem of losing your module items if you get flashed. ...
2014-11-29 09:49:02 +01:00
PsiOmegaDelta
4c476e70ce
Merge pull request #7149 from GinjaNinja32/ghostparam
...
Allow ghosts to type the parameters to Jump-to-Mob, Follow, and Teleport
2014-11-29 09:48:55 +01:00
PsiOmegaDelta
6adc68bbd1
Merge pull request #7145 from GinjaNinja32/dmitool
...
DMI tool thingy. Is able to do many things with DMI files.
2014-11-29 09:48:47 +01:00
PsiOmegaDelta
7aadb7999d
Merge pull request #7139 from mwerezak/shield-zas
...
Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup.
2014-11-29 09:48:39 +01:00
Atlantiscze
df50049889
Attempt to fix mapmerge issue
2014-11-29 04:04:51 +01:00
