Commit Graph

1537 Commits

Author SHA1 Message Date
Zuhayr
8d9d83d5ef Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-24 09:12:02 +10:30
Graham Lloyd
c764a94073 fixes some annoying punctuation errors. 2014-10-22 15:58:27 -04:00
Chinsky
bad385e1d1 Merge pull request #6791 from Zuhayr/dev
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-21 01:13:17 +04:00
Chinsky
3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm
2014-10-20 04:52:45 +04:00
PsiOmega
58409c68bc Unnamed manifest ghosts now receive their role as name.
Also, BYOND's pick() method appears to have rather iffy randomness. Added some more terms to help it out.
2014-10-19 15:19:21 +02:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr
f31ffb11c2 Fixes #6752 2014-10-18 08:09:50 +10:30
Zuhayr
b7bdb3ce06 Fixes #6759 2014-10-18 07:56:11 +10:30
Zuhayr
e147c60c50 Makes heist unvotable and fixes the language bug with spawned vox. 2014-10-17 14:20:39 +10:30
Zuhayr
840c018689 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-10-12 02:06:27 +10:30
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
PsiOmega
66483cf6dd Completes the transfer to the refreshed announcement system. 2014-10-07 13:19:20 +02:00
Gamerofthegame
a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
Zuhayr
3f05362577 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-10-01 18:16:04 +09:30
PsiOmega
f95d6f36b9 Manifest ghosts are now given an assigned role to go with the round end summary. 2014-10-01 00:22:13 +02:00
PsiOmega
4f7b32ae4f Round-end summary now also lists job 2014-09-30 10:07:59 +02:00
Zuhayr
b4646b65e8 Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks. 2014-09-30 14:09:41 +09:30
Zuhayr
a0d23b3800 Reimplements ninja and cult species rarity bonuses. 2014-09-30 12:17:33 +09:30
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
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