cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,984 Commits 2 Branches 1 Tag
6393cb15d8f10833e899bad30812180424931b3d
Commit Graph

553 Commits

Author SHA1 Message Date
Zuhayr
abd17deb5b Fixes #3962 2013-11-23 14:02:10 +10:30
Zuhayr
7cc1c93207 Clamps pill numbers between 1 and 20. 2013-11-23 13:47:20 +10:30
Zuhayr
32b2009c25 Diona will take five times as much damage from plant-B-gone as previously. 2013-11-20 18:26:55 +10:30
Zuhayr
542104478f Commented out the Sec-healing component of sprinkles. 2013-11-20 18:18:55 +10:30
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
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
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
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
DJSnapshot
7665a1a00e Merge pull request #3895 from Baystation12/master 
Merge Dev with Master
 2013-11-07 16:31:43 -08:00
Kilakk
ee34d281f9 Fixes #3890, gave Aloe a more reasonable boozepwr 2013-11-07 18:54:42 -05: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
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
Iamgoofball
2c30455b10 Grammar tango, spotted and eliminated. 2013-11-02 15:33:22 -07:00
Iamgoofball
ca741fbdd7 Two booze dispenser bug tangos down. You couldn't put drinking glasses in, and Whiskey wasn't in the reagents list. 2013-11-02 15:09:04 -07:00
DJSnapshot
39387fa3bb Merge pull request #3840 from MDReckless/dev 
Grape Soda addition
 2013-10-29 17:06:16 -07:00
DJSnapshot
8bb22f7e18 Merge pull request #3846 from Iamgoofball/boozetaketwo 
Fixed a CATASTROPHIC GAME-CHANGING BUG with the Soda Dispenser that resulted in much immersuhan breaking: Grape Soda wasn't in the Soda Dispenser dispensable reagents list.
 2013-10-29 17:03:54 -07:00
Iamgoofball
a4737f3b22 Added GRAPE DRANK to the Soda Dispenser. 2013-10-29 16:56:50 -07:00
MDReckless
5a8a629df7 Update drinkingglass.dm 2013-10-28 15:55:54 -04:00
Cael Aislinn
c419717255 tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:33:23 +10:00
MDReckless
e6d42432ff Changed grape soda description 2013-10-28 15:03:30 -04:00
MDReckless
152d83d47c Update drinkingglass.dm 2013-10-28 15:02:14 -04:00
MDReckless
39d312e69d Removed grape juice from unneeded area 2013-10-28 15:00:21 -04:00
MDReckless
811a4b1aa9 Adds Grape Soda as a reagent 
Allows grape soda in a beaker and gives it color
 2013-10-28 14:57:08 -04:00
MDReckless
809a7faf58 Adding Grapes to the Juicer allow list 
Grapes grown from hydroponics can now be juiced
 2013-10-28 14:45:36 -04:00
MDReckless
67fcd2e6e4 Grape Soda 
Adds grape soda as a recipe
 2013-10-28 11:24:45 -04:00
Iamgoofball
3fa88bb7ff Fixed beakers not going into DNA scannners. 2013-10-27 13:13:26 -07:00
Iamgoofball
e58438cae8 Fixed the Glass.dm can_be_placed_into list. 2013-10-27 13:09:12 -07:00
Segrain
93cfba21a7 Fix for #3826. 2013-10-27 21:55:08 +03:00
Iamgoofball
7b1dd38d06 Removed a useless variable, and changed the lists modifications to use += and -= 2013-10-26 22:39:41 -07:00
Iamgoofball
f7ad7cbddb Actually added the new beakers. Yay for git. 2013-10-26 21:57:26 -07:00
Iamgoofball
cfbe1c6ad1 Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker. 2013-10-26 21:52:13 -07:00
Segrain
6cf485deae Quickfix. 2013-10-24 19:13:05 +03:00
Chinsky
1488850ad1 Merge pull request #3803 from Nanai/dev 
Drinks Pack/Spritefixes and Vending Machine Loadout
 2013-10-21 04:30:15 -07:00
Nanai
4c01ecaee4 Fixed iced tea, adds canned ice tea and grape juice, adds grape juice, melon liquor, blue curacao, grenadine, poisonous wine. rebalances absinthe, and places it within the vendor. 2013-10-21 07:11:40 -04:00
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
ZekeSulastin
3455bf7cc1 Add/remove beaker from sleeper for dialysis 
Redoes the sleeper attackby() prompt to match cryo's style.  Also
removes the millionbeaker in favor of a standard large.
 2013-10-19 17:03:13 -04:00
Nanai
752f9f80eb Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into uguu 2013-10-19 13:13:02 -04:00
Segrain
da96d45bc0 Smallfix. 2013-10-17 04:00:33 +03:00
Segrain
6ece0850af Volume fix. 2013-10-17 03:53:03 +03:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze 
BYOND AKBAR
 2013-10-10 02:45:45 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01:00
Chinsky
7555dd0f0b Merge branch 'master' into dev 
Conflicts:
	code/setup.dm
 2013-10-08 15:16:57 +04:00
Mloc-Argent
ebf2ba2d4a Fixes. 
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:35:26 +01:00
Mloc-Argent
8b2c3fc153 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:24:21 +01:00
Chinsky
f53fa1dee2 Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro 
Conflicts:
	code/modules/virus2/disease2.dm
	code/modules/virus2/effect.dm
 2013-10-06 13:34:50 +04:00
Mloc-Argent
9ab11c0aeb virus fixes. WIP will update commit message later 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-05 18:52:08 +01:00
Nanai
f78800a248 Minor Food Fix: Made basic salad nonhallucinogenic, uses 2 cabbage 1 tomato 1 carrot 1 apple for recipe. Moved Valid Salad's Doctor's Delight to the Aesir Salad. 2013-09-30 02:02:49 -04:00
Mloc
49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01:00