Commit Graph

847 Commits

Author SHA1 Message Date
ikarrus e73586dadf Resolved Conflicts:
code/modules/security levels/keycard authentication.dm
2014-03-18 00:17:22 -06:00
Razharas 072b8d2bcb Merge pull request #3067 from Giacom/virus_food_mix
Forgot to change the virus mix reaction, for blood + virus food, to 1 unit.
2014-03-17 09:02:45 -07:00
ikarrus d065af8b8c Emergency Access Override Update
-Changed the way emergency access override is handled. It now toggles a var which overrides access requirements instead of removing/adding access
-Airlocks now have blinking amber lights when in emergency mode
-AIs can toggle emergency override on individual doors
-Humans may disable emergency overrides by pulsing the ID scanner wire. They can't enable it, since IMO there are enough methods to hack open doors without an easymode all-access wire
2014-03-15 14:59:39 -06:00
Perakp fa56f9892e Merge with master, dissonant shriek and organic space suit
- Changed dissonant shriek and organic space suit from old verb system
to new system.
2014-03-15 13:49:26 +02:00
Giacomand b48895d811 The genetic symptoms will now archive your DNA and set your DNA back when it is cured. 2014-03-14 15:45:19 +00:00
Razharas 371f29ed5f Merge pull request #3018 from Aranclanos/RetrovirusRuntime
Retrovirus runtime fix
2014-03-12 22:31:54 -07:00
fleure 8399cdb44d Added watertank crates 2014-03-10 20:46:53 +00:00
Cheridan f8facf7f43 Merge pull request #3021 from Giacom/viro_genetics
Added two new symptoms to virology.
2014-03-10 13:31:04 -05:00
Giacomand 1f44d20451 Fixed a typo which was preventing powers from manifesting properly. 2014-03-09 19:18:23 +00:00
Giacomand a92482ee4a Added two new symptoms to virology. They will mutate the victim and randomly set a power/disability block, after cleaning it to remove remaining powers/disabilities. One symptom only sets powers and the other only sets disabilities.
Changed the virus mix reaction to only require one plasma or mutagen, to remove the annoyance that virology has with the randomness aspect of it.

Refactor'd dna code to be a little tidier.
2014-03-07 17:49:01 +00:00
Aranclanos 4c06c21b78 Fixes a runtime regarding the retrovirus deleting itself when there's no affected mob 2014-03-07 10:54:55 -03:00
Ergovisavi 062f368ce0 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 2014-03-07 04:24:51 -08:00
Ergovisavi a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
Item attack changes
2014-03-06 03:17:02 -08:00
Razharas c548df264b Conflict fix 2014-03-05 06:30:29 +04:00
MrSnapwalk 00fd755b8c Automerge Fix 2: Electric Boogaloo
This is why we can't have nice things.
2014-03-03 20:12:30 -06:00
Cheridan d4c81ce247 Merge pull request #2936 from MrPerson/jitterbug_dizzydummies
Redo of jitteriness and dizziness.
2014-03-03 11:35:27 -06:00
Razharas f3ccaa5936 Merge conflicts fix 2014-03-03 05:42:31 +04:00
MrSnapwalk 789134d8f2 Automerge fix
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00
MrSnapwalk b03fc3d645 More suits, and more fixes.
More suits by Nienhaus, and a few fixes for the contents of lockers.
Also added a dermal armor patch to the Captain's locker, for added head
protection without the downside of helmet-hair.
2014-03-02 16:10:08 -06:00
Razharas 6b14c42c41 Merge pull request #2898 from ChuckTheSheep/TC-Green-Text
TC use count appears on round end
2014-03-02 13:02:28 -08:00
Perakp 10f12b517e Fixed an issue with lesser form and fake death where you would be made a changeling for no reason. 2014-03-02 20:21:55 +02:00
Perakp edb2154b48 - Changes changeling abilities from verbs to proc_holder objects.
- Functionality should be unchanged
- Admins can varedit chemical costs of individual abilities.
- Allows coders to implement sting upgrades more easily.
2014-03-02 09:12:03 +02:00
MrSnapwalk b6a60a07b4 Makes fancy items obtainable.
Adds a formal-wear crate, makes lawyers have laceup shoes, adds a better
sprite for the memorizer, adds the formal uniforms to each job's closet,
and fixes a typo in the object name of the black jacket. [FORMALNESS
INTENSIFIES]
2014-03-01 19:44:22 -06:00
Ergovisavi ac269baacb Fixes bullet_act not checking for damagetype on many, many objects.
Replaces Holodamage with Stamina damage, if your stamina damage exceeds your current health, you get weaken(5)'d. Stamina heals itself slowly over time.
Makes the hallucination enemies deal more stamina damage than they did holodamage, but stamina damage heals now so it's mostly for just seeming threatening at the moment.
Adds the Disabler, a gun that does stamina damage. It has a range of your screen, but no more. Adds a disabler crate to cargo (security lock)
Fixes Lasertag ED209's because they were busted as shit
Reduces ED209's view range to 9 from 12, which was several times longer than your screen view, now is only a little bit more
Lastertag now does stamina damage instead of an instant stun for that GRITTY LASERTAG EXPERIENCE
2014-03-01 16:39:22 -08:00
Razharas 2fd5557682 Conflict fix 2014-03-02 04:14:32 +04:00
YotaXP cb7052f81c Removed group_multiplier nonsense from gas_mixture.
Moved gas_mixture.dm to the datums directory.
Deleted FEA.
2014-02-28 18:12:33 -05:00
MrPerson 48923f9ce5 Redo of jitteriness and dizziness.
Fixes #2923
2014-02-27 23:19:44 -08:00
TZK13 16f407983c Adds an emergency supply crate containing two sets of the contents within fire safety closets for 10 supply points. 2014-02-26 12:55:40 -06:00
ChuckTheSheep 21d621c049 Merge remote-tracking branch 'upstream/master' into TC-Green-Text 2014-02-25 20:19:32 -05:00
Razharas fdf5a2bb12 Fixes autolathe 2014-02-25 08:22:24 +04:00
Razharas 56f94f59da Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag 2014-02-25 05:05:22 +04:00
AlexanderUlanH 7de04b6c3c Merge branch 'master' into spaceareas 2014-02-24 17:47:19 -05:00
Cheridan ded7b01f5f Merge pull request #2829 from Razharas/LifeLikeTexture
Autolathe improvements
2014-02-24 16:27:16 -06:00
Cheridan 0484924e95 Merge pull request #2882 from Miauw62/diojagijasdgjisagopagpjsagpoagpjga
Fixed #2880 horse mask removable
2014-02-24 15:57:39 -06:00
ChuckTheSheep 297b67c23f Boxes show contents 2014-02-24 13:59:38 -05:00
ChuckTheSheep 656ce372c7 Adds Icons and purchase list 2014-02-24 01:44:11 -05:00
ChuckTheSheep 6ecb511a24 TC use count appears on round end 2014-02-23 23:43:45 -05:00
Razharas b27d9c7396 Added RPED, some sprites and new power cell path
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
2014-02-24 05:14:43 +04:00
Miauw ef1710a058 Fixed horsemasks properly 2014-02-23 19:01:35 +01:00
Aranclanos e6c856e456 Merge pull request #2803 from Rockdtben/SyndCardDesc
Synd card desc
2014-02-23 13:46:10 -02:00
Aranclanos b44c6ffdf9 Merge pull request #2801 from Razharas/Vendors
Vendor fixes and stuff
2014-02-22 14:22:11 -02:00
Razharas a651ff1c67 Fix for runtime after spawn in diseases
What a twist
2014-02-21 18:07:04 +04:00
Razharas ff27f5d426 Merge pull request #2826 from YotaXP/polaroid-fix
Long overdue fixes to the Polaroid cameras.
2014-02-20 16:22:59 -08:00
AlexanderUlanH 1d6981c2d3 Remove name checks 2014-02-19 17:23:57 -05:00
Perakp 965e7ad6d8 Merge to master
Conflicts in mob.dm
2014-02-18 23:59:59 +02:00
YotaXP 35ba26b3ea Fixed coloring, overlays on overlays, and blood trails. 2014-02-18 16:54:22 -05:00
Razharas befd05f1ff Fixing copypaste issues
Thanks RR
2014-02-18 23:50:43 +04:00
Razharas 71c551b295 Fixing merge conflicts
Yep
2014-02-18 23:48:35 +04:00
Razharas d844bbd1ee Autolathe improvements
Tided up the code
Made it use generic datum wires , vars and sexier menu
Didnt change it gameplay-wise
2014-02-18 18:36:09 +04:00
Rockdtben 8cca6e3cbb Changed uplink description 2014-02-15 10:47:36 -06:00