Commit Graph

9652 Commits

Author SHA1 Message Date
PsiOmega
957ff8314d Cargo can now order empty blood packs. 2014-11-30 16:45:52 +01: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
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
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
dbf69cba81 Merge pull request #7154 from PsiOmegaDelta/SneakyPersonalAIs
pAIs can now hide.
2014-11-30 12:50:44 +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
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
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
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
Atlantiscze
682164335a EMITTER MINING!
Yes! You can now mine using emitters. Each rock takes 3 blasts to break. This method will also yield less ore than other conventional methods. But using big lasers for mining is cool, right? Who cares about productivity.
2014-11-29 22:54:16 +01: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
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
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
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
0fda5bf9b8 Nukeops shuttle docking
- Nukeops (or newly mercenaries) can now dock with the station. Two locations are available, maintenance between virology and xenobiology and arrivals.
- You always have to hack in or be let in. The door won't open on it's own. This is intentional as the shuttle is considered unrecognised by station's docking system. AI or anyone else can open the doors for you if needed.
- Also fixes bug which broke the shuttle console, since someone who was renaming nukeops to mercenaries forgot to change one line in antagonist.dm
2014-11-29 03:51:45 +01:00
Atlantiscze
bc9fea0fa6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into buildable-smes-fix 2014-11-29 02:42:24 +01:00
mwerezak
b84bb4ff23 Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup. 2014-11-28 19:37:31 -05:00
Atlantiscze
12c8b73bdf Fixed exploit that allowed you to generate infinite power by repeatedly disassembling and building SMES with same parts. New SMES would always start on 20% charge. 2014-11-29 01:19:34 +01:00
Amunak
95032936ce Separated pAI and posibrain candidacy, fixed their jobbans.
You can now toggle special role candidacy for pAIs and Positronic Brains separately. A pAI jobban will now display correctly.  People will be banned from posibrain if they have a jobban on both AI and Cyborg (this is reflected in the character creation GUI as well). Using 'never for this round' on the pAI popup is no longer irreversible.
2014-11-29 00:31:27 +01:00
Atlantiscze
25ddc19df4 Fractal Energy Reactor can now be mapped in.
Will be used as replacement for Telecomms magical SMES which is buggy. This thingy should work just fine.
2014-11-28 21:35:02 +01:00
PsiOmega
2f739975db Late-Join Name Addition.
When late-joining the name of the currently loaded slot is shown at the top of the job selection screen.
2014-11-28 20:31:26 +01:00
PsiOmega
fe493c4282 Fixes AIs seeing runes in the Alt+Click panel
See https://github.com/tgstation/-tg-station/pull/6126.
2014-11-28 19:36:27 +01:00
Amunak
93859e9652 Dead chat will get announcements when someone joins or leaves it.
This is mainly for wizard and cult rounds, where it is important to know that a wizard/cultist is watching. The announcement was added for most other types of leaving/joining the ghost realm. Admin ghost doesn't get announced for obvious reasons.
2014-11-28 13:05:26 +01:00
Amunak
93b195d78d Fixed a bug that prevented from joining as posibrain. 2014-11-28 13:04:23 +01:00
Amunak
3a5d89a47f Revert "Fixed a bug that prevented people joining as posibrain"
This reverts commit 643bac47cb.
2014-11-28 12:59:23 +01:00
Amunak
643bac47cb Fixed a bug that prevented people joining as posibrain 2014-11-28 12:50:52 +01:00
Amunak
44e67b3f53 Posibrain candidates will now be asked twice if they want to join the game 2014-11-28 12:41:31 +01:00
Amunak
2750092045 The analyze-air verb now shows temperature in Kelvins in addition to degrees Celsius. 2014-11-28 12:24:59 +01:00
Amunak
4da6eeb82b Dead chat now uses a single proc for broadcast. Improved dchat formatting, added chattags 2014-11-28 12:23:59 +01:00
Amunak
82322f146e Admin PM cleanup; moved styles to stylesheet.dm, added chattags 2014-11-28 12:05:11 +01:00
Amunak
9e40851998 Moved formatting of admin and mod say channels to stylesheet + added chattags
This actually removes some stuff from asay and msay. The only place where admins and mods(/mentors/whatever) are distinct now is msay, and only in name: admins have their nick colored like their OOC chat (though this can be changed in stylesheet.dm). Also added the feedback thingy proc call and did some code cleanup.
2014-11-28 12:02:04 +01:00