Zuhayr
9fcde12b4f
Organ rewrite mapclean attempt.
2014-09-29 06:18:58 +09:30
Zuhayr
97801b4617
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-09-29 00:39:43 +09:30
Boop
7116415e4d
Fix meteors
...
yay
2014-09-28 15:59:02 +01:00
Zuhayr
cc52be3192
Merge resolution, replaced 2 wires lost in map merge.
2014-09-25 23:54:24 +09:30
Zuhayr
9272bc4542
Fixes #6351 and #6350 .
2014-09-25 21:19:35 +09:30
Zuhayr
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
Chinsky
9e2dcc4e4a
Merge pull request #6455 from Zuhayr/master
...
Calamity and hydro tweaks
2014-09-20 00:07:56 +04:00
Zuhayr
39689f05c7
Removed borer from roundstart calamity, added it to the dynamic event handler. Increased event frequency.
2014-09-18 21:41:54 +09:30
PsiOmega
fe126626ac
Cleans up radio frequency numbers.
...
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
PsiOmega
cdae6254a9
Fixes #6440
...
Changes cult conversation to use \him instead of him.
2014-09-18 07:45:44 +02:00
Chinsky
78a168ed55
Merge pull request #6416 from Hubblenaut/master
...
Fixes and Improvements Patch
2014-09-18 09:00:38 +04:00
Zuhayr
5c2e039e15
Borer fixes and tweaks.
2014-09-18 14:00:43 +09:30
Hubblenaut
a10b7284e5
Fixes nuke-op radios not having freerange set
2014-09-17 16:02:32 +02:00
Hubblenaut
33484a9f90
Fixes syndicates spawning with locker instead of uplink
2014-09-17 15:33:07 +02:00
Hubblenaut
1b1505153e
Fixes Nuke-ops spawning with unwanted items
2014-09-17 14:15:26 +02:00
Zuhayr
24804b314a
Should fix clam mode. Wish I could test it here.
2014-09-17 11:37:09 +09:30
Snapshot
12495cbe59
Merge pull request #6378 from PsiOmegaDelta/NinjaSpawn
...
Sanity checks ninja spawns
2014-09-15 01:01:20 -07:00
Snapshot
db36243410
Merge pull request #6380 from Zuhayr/master
...
Calamity fix.
2014-09-14 22:03:06 -07:00
Zuhayr
1da290d14d
Fix for cyborgs becoming lings in calamity mode.
2014-09-15 14:22:33 +09:30
PsiOmega
ae1a3f3860
Sanity checks ninja spawns
...
Reduces the risk of ninjas spawning in the middle of space, having no idea which direction the station is.
2014-09-14 21:25:42 +02:00
Chinsky
200a1c0d01
Merge pull request #6328 from atlantiscze/malf-explode-fix
...
Malfunction Explode Fix
2014-09-14 21:48:57 +04:00
Zuhayr
fbfdfcc3a5
Should fix repeated antag selection for antag counts below max in calamity mode.
2014-09-15 01:10:25 +09:30
Atlantiscze
962048f65f
iFail typo fix
2014-09-14 06:31:34 +02:00
Atlantiscze
b0cee19174
Better attempt to make AI Explode verb fix for malfunction. Should not mess up whole file formatting.
2014-09-14 06:28:20 +02:00
Atlantiscze
239d690d5e
Revert "Explode Verb Fix"
...
This reverts commit a7edc3f39d
2014-09-14 06:27:05 +02:00
Chinsky
9cc0ded4e0
Merge pull request #6319 from PsiOmegaDelta/IAmNinja
...
Ninjas can now phase jaunt.
2014-09-13 03:53:12 +04:00
Atlantiscze
a7edc3f39d
Explode Verb Fix
...
- Explode verb is now available from round start. This ensures it works properly and won't disappear during 60 second time limit.
- Checks are moved into explode verb itself, so it works exactly as it used to work (read: It won't let you blow up station unless done within that 60s limit after takeover)
- Changed self destruct notifications a little. They now use radio messages instead of "world <<" which was ugly.
- If AI is killed within 10 second self-destruct countdown it is aborted. (Good luck)
2014-09-12 17:30:51 +02:00
Atlantiscze
9ff1f94152
Round end spam fix
...
- This ensures that "The round has ended" message is shown only once, instead of being spammed under certain circumstances.
2014-09-12 17:24:57 +02:00
PsiOmega
3853782914
Ninjas can now phase jaunt.
...
Adds phase jaunt for a cost of 250 energy, compared to phase shift which costs 400E.
Randomly jumps the ninja 5-9 tiles straight ahead.
Cell use is now redacted directly in the ninjacost() proc.
Some cleanup of ninja verb-add/removal.
2014-09-11 15:02:42 +02:00
PsiOmega
34346cf308
Ninja-night vision now works.
...
A ninja now uses proper glasses instead of using its own hack.
Fixed a bug that would override the old ninja-night vision unless one also wore additional glasses in the glasses-inventory slot.
Adds overlays to thermals and mesons as well. Slightly reduces the intensity of the night vision overlay.
2014-09-11 13:43:13 +02:00
PsiOmega
98bc0d5f60
Fixes a bug where people who were in the lobby but not observers were considered non-survivors in shift-end feedback.
2014-09-05 11:00:47 +02:00
Zuhayr
67cb6e297e
Merge pull request #6254 from Kelenius/OfStacks
...
Of Stacks
2014-09-02 17:58:28 +09:30
Kelenius
505f857eb8
Stack update
2014-09-02 09:59:32 +04:00
Chinsky
4ceb7dbd55
Merge pull request #6215 from PsiOmegaDelta/SyndiPDA
...
Syndicate Uplink - string to datum
2014-08-29 15:42:38 +04:00
PsiOmega
7e74ae82f5
Updates the Syndicate uplink to use a more robust datum system, rather than the old way of parsing a giant string.
2014-08-29 12:48:12 +02:00
Chinsky
fac6666b58
Merge pull request #6188 from Kelenius/OfWizardsAndOrbs
...
Adds a scrying orb for wizards
2014-08-28 14:44:07 +04:00
Kelenius
7ceddc39fb
Adds a scrying orb for wizards
2014-08-27 10:09:56 +04:00
PsiOmega
3377ca1bfb
Based on https://github.com/tgstation/-tg-station/pull/4562 and adapted to BS12 shuttle code. Credit to @Ikarrus.
2014-08-25 07:37:59 +02:00
PsiOmega
61d40e2405
Non-random traitor code word assignment.
2014-08-24 12:47:48 +02:00
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
Hubblenaut
736741a5c2
Changes 'Lawyer' to 'Internal Affairs Agent' in restricted job lists
2014-08-16 19:08:22 +02:00
Chinsky
658941a0f9
Merge pull request #5978 from Zuhayr/journalism
...
Mining changes and basic character backgrounds.
2014-08-14 10:54:49 +04:00
Chinsky
1c5e944ce5
Merge pull request #5954 from Zuhayr/dev
...
No one is going to read this all anyway
2014-08-13 18:33:09 +04:00
Zuhayr
688cf22a67
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-08-13 17:10:37 +09:30
Lancer411
80305bc2fb
Checks for SMES Z level at power_failure.dm
...
Little fix which checks Z level of SMES before drying it up at grid_check event.
2014-08-12 22:05:28 +08:00
Lancer411
784b546e93
Fixes for grid_check random event.
...
There was an issue, when APC with removed cell in area was powered at power_restore() proc, making area allways powered despite APC was not working.
Removed part of code which unpowers area directly, bypassing the APC process code. This makes grid_check event less laggy and smooth. Downside is lights not being shut down immediatly.
AI SMES still not being affected after this fix.
2014-08-12 19:50:20 +08:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Zuhayr
beaad5a37b
Merged in preferences file changes, changed None to Unset for home system.
2014-08-11 10:38:01 +09:30
Zuhayr
7c46a67551
Merge pull request #5949 from Ccomp5950/cult-tele
...
Summon cultist and free cultists runes now give cultists less damage
2014-08-11 10:13:12 +09:30
Ccomp5950
756b220bf3
Summon cultist and free cultists runes now give cultists less damage
...
Damage scales downward with each additional cultists around the rune.
No more automatic 15 damage for freedom then 25 for summoning even if you have 8 cultists helping with the ritual.
2014-08-10 18:26:58 -05:00
