Commit Graph

7479 Commits

Author SHA1 Message Date
DJSnapshot
bad8dbf695 Merge pull request #3918 from Nanai/dev
Yinadele lodesofcoed
2013-11-15 21:36:03 -08:00
Nanai
e87b59f75b Minor Painkiller Rework
Added a proper lid for scaling on paracetamol, added in the ability to get high off of painkiller overdoses.
2013-11-15 19:27:10 -05:00
Nanai
5cce782c34 Tool definition fix.
Properly accounted for bruisepacks vs poultices under Chinsky's PR.
2013-11-15 19:26:28 -05:00
Mloc-Argent
cad2c524a8 Tree fixery.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-11-15 23:11:11 +00:00
Chinsky
3aa7f498b3 Merge pull request #3920 from Kilakk/master
Fixes #3886, ATMs no longer log you in automagically
2013-11-15 01:55:29 -08:00
Ccomp5950
734d89c669 BugFix: Cult Ghosts...after a bit of professional advise from chinsky.
Problem:  Cult members can't use the rune to see ghosts, then beat ghosts over the head.  it was being intercepted by _onclick and processed there and only displaying an angry red notice
that you hit that ghost.  Ghost didn't become visible, it disappeared soon after moving off the rune.

Solution:  Made an attackby for ghosts to check when they are being beat up by cultist with books, now they appear.

Minor feature change:  Now if a visible ghost gets hit it will give a different message than the standard "Ghost is pulled through from the other side".
2013-11-15 01:00:25 -06:00
Kilakk
99321389f2 Fixes #3886, ATMs no longer log you in automagically
Silly security level 0 ruined everything
Added a tiny sanity check as well to avoid runtimes
2013-11-14 21:45:25 -05:00
Nanai
7786e7a96c Sleeper Addition, Chemical Rebalance 2
Tweaked soporific and new chems a bit more. Added Paracetamol, a lesser drug to tramadol, known to all as tylenol, and implemented it into sleepers! Gave inaprovaline the IB slowing property to keep sleepers in the game and allow EMTs better usage. Oxycodone made easier to craft by making the plasma a catalyst, but decreased it's overdose limit. Applied oxycodone and paracetamol to be able to handle things painkillers should.
2013-11-14 19:11:31 -05:00
Nanai
160e0f9ee8 Poultice potency, bugfixes
Herbal poultice effectiveness now scales with potency of base herb.
2013-11-14 15:21:29 -05:00
Ccomp5950
1a3a599087 Created a proc that sets the ghosts timeofdeath to a time 30 minutes before round start, this does not effect the ghosts original body, just the ghost mobs.
Since ghosts may not respawn within 30 minutes of death this allows mods/admins to bypass it for ghosts and sends the player a message letting them know they can respawn now
as well as reminding them to roleplay correctly.

Before this admins were editing the variable directly.
2013-11-14 13:26:12 -06:00
Nanai
7ce2314c11 Merge Fixes
Fixes issues post merge and and with minor sanity checks and neatness.
2013-11-14 13:08:40 -05:00
Nanai
ae31f9cdcf Surgery Update
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.
2013-11-14 13:08:31 -05:00
Nanai
a104453156 Added and Adjusted Chemicals
Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.

New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.

Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.
2013-11-14 13:08:30 -05:00
Nanai
2416ae715c Full Eye and Robot Organ Implementation
Tested work to implement eyes ad internal organs and the charpref selectable robotic organ replacements for heart and eyes, both for assisted and fully mechanical variants!
2013-11-14 13:08:29 -05:00
Nanai
6eccd98d16 5 New Hairstyles!
Fully done insofar, these new hairstyles are Gentle, Long Braid, and Side Ponytail for humans. Tajara Bangs, and Tajara braid for Tajaran.
2013-11-14 12:40:32 -05:00
Nanai
cba1a9585d Medical Hoopery
Added eyes as an internal organ, removed the eye-stat var on mobs and changed it to properly direct it to eye damage. Altered all reference.

Updated the sleeper to allow for ejection of the beakers and occupants in panel.

Updated the body scanner to check for prosthetics/mechanized organs, and inform the individual of the blind disability.

Laid the groundwork for mechanical and assisted internal organs.

Groundwork for chemical: Peridaxon, a chemical that allows for the slow regeneration from organ damage.
2013-11-14 12:40:30 -05:00
Nanai
a909ceccc9 Additional Hairstyles!
Two human hairstyles: Gentle, and Side Ponytail, and two new Tajaran hairstyles, Bangs and Braid.
2013-11-14 12:40:02 -05:00
Nanai
25c55ed354 Germ Fix
Fix for missing and robotic limbs getting infected with germs and being incurable.
2013-11-14 12:39:51 -05:00
Ccomp5950
b75af8adcb Ghosts will now see bold text if they have ghostears on and the player speaking is visible to the ghost (same room, within 7 tiles).
Allows ghosts to better be able to tell who is within a conversation they are focusing on while also allowing them to listen in on outside conversations.
2013-11-14 06:28:08 -06:00
Mloc-Argent
e6b44d0f35 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2013-11-14 12:03:59 +00:00
Michael Johnson
bcd140a691 Made the telesci console a proper NanoUI 2013-11-13 08:01:00 -05:00
LightningIron
b5671e8bd8 Surgery grammar fixes 2013-11-10 13:08:44 -06:00
Iamgoofball
3e02b55386 reduced fizzle chance to 50, it was very common and overrode everything 2013-11-09 22:51:20 -08:00
Iamgoofball
d83c07ca0e Made telescience WORK! 2013-11-09 22:42:54 -08:00
Mloc
6f19999a9c Merge pull request #3897 from comma/organstuff
Minor organ optimizations
2013-11-08 05:44:24 -08:00
Chinsky
d1be0cba0b Healing wounds should properly update damage overlay if needed. 2013-11-08 08:10:50 +04:00
Chinsky
3992888ea6 removed some unneeded icon update calls (haha totally unneeded yeah)
replaced complete regenerate_icons with just body_update in case of dropping limb
2013-11-08 04:34:37 +04:00
DJSnapshot
7665a1a00e Merge pull request #3895 from Baystation12/master
Merge Dev with Master
2013-11-07 16:31:43 -08:00
Chinsky
04237f47cb Merge pull request #3894 from DJSnapshot/master
Fix for fire alarms in Mining and Research Outpost
2013-11-07 16:27:38 -08:00
Chinsky
6d369caae7 Replaces long check with lots of get_organ calls with shorter one.
Also changed weird condition that amputated leg must not be splinted.
Removed checks for haslimbs, since movement while downed is not possible anyway.
Moved some special effects for broken limbs after check for such, so healthy ones wont bother.

Fixed a derp in populating the global list of sideffects.
2013-11-08 04:15:49 +04:00
DJSnapshot
7c59c41b13 Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station. 2013-11-07 16:02:57 -08:00
Kilakk
ee34d281f9 Fixes #3890, gave Aloe a more reasonable boozepwr 2013-11-07 18:54:42 -05:00
Mloc
d2fa118fc7 Merge pull request #3888 from comma/dev
Nerfing icons
2013-11-07 12:30:16 -08:00
Iamgoofball
9ce90a0f41 Note to self: Remember to push your nerfs next time. 2013-11-06 19:10:35 -08:00
Chinsky
e513b6943e Forgot to remove lying icons / need for them for monkeys. Ook. 2013-11-06 23:54:13 +04:00
Chinsky
ba63c5a1bc Removed overlays_lying.
Now all that shit is done by fancy transformations, client-side.
2013-11-06 22:45:32 +04:00
Chinsky
e3d19eceab Updated paths for smoke generator 2013-11-06 22:44:56 +04:00
Iamgoofball
60e73bc9ac Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into boozetaketwo 2013-11-05 11:44:37 -08:00
Mloc
2eb98fd86e Merge pull request #3879 from comma/master
derp
2013-11-04 15:18:50 -08:00
Chinsky
5df1b3c0d4 derp 2013-11-05 03:17:44 +04:00
Chinsky
65c248cda0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma 2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f Cleaned the fuck out of smoke. 2013-11-05 02:57:23 +04:00
Mloc-Argent
8005d8bf2b More power to devs. (this is a bad idea)
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-11-04 21:31:29 +00:00
Iamgoofball
ec90e5b3c4 Fixed worldloop issues. 2013-11-04 13:19:26 -08:00
Iamgoofball
ee50a26a6b Removed Fart event, fixed copypasta x999, added the telepads to the machines list. 2013-11-04 13:16:00 -08:00
Mloc
68f796b572 Merge pull request #3874 from comma/master
Some virus fixes
2013-11-04 13:15:40 -08:00
Chinsky
40e862fe00 GC's virus dummies #whoa #derp 2013-11-05 01:13:49 +04:00
DJSnapshot
c20c84b328 Dun goofed 2013-11-04 13:10:33 -08:00
Chinsky
3a425c6095 Another uncommented log debug line. 2013-11-05 01:08:31 +04:00
DJSnapshot
15a2bcc54f Fix so bans can work again. 2013-11-04 13:07:03 -08:00