cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 22:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,890 Commits 5 Branches 1 Tag
810de4ddaa57a2b51a302037382e34c8eb80362a
Commit Graph

187 Commits

Author SHA1 Message Date
Zuhayr
5cddea72f0 Colour fix for bread slices. 2014-01-11 02:50:49 +10:30
Zuhayr
212eed7e1c Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food. 2014-01-11 02:47:12 +10:30
Zuhayr
16a28b7338 Added filling_color var to food items for use in sandwiches. 2014-01-11 02:35:10 +10:30
Zuhayr
f23bb5e1fd Roasted diona, for ZomgPonies/Paradise. 2014-01-10 00:26:23 +10:30
Zuhayr
b28592d707 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-06 13:42:23 +10:30
Zuhayr
5940993694 Removed a return. 2014-01-05 14:20:53 +10:30
Zuhayr
19979562c9 Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel. 2014-01-05 14:20:23 +10:30
Zuhayr
b05f81df3d Added NO_BLOOD checks to drips, syringes. 2014-01-05 14:13:58 +10:30
RKF45
9b62f7b23d Small fixes, again 2014-01-04 21:26:28 +01:00
DJSnapshot
b294174acb Openable soda cans and beer bottles! 2013-12-31 17:52:12 -08:00
Zuhayr
6888651da6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2013-12-28 23:14:43 +10:30
SkyMarshal
30970b7b56 Hypothetically adds proximity check to droppers. 
This code is awful, but it appears "flag" (who names this shit?) acts as a proximity check.
 2013-12-26 21:22:00 -07:00
Zuhayr
8b0f778a83 Mass updates to paths for blood decals. 2013-12-26 01:56:06 +10:30
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
Zuhayr
c4b847e9c6 Amendment to chemistry beaker range fix. 2013-12-18 23:54:11 +10:30
Zuhayr
9f9b5285d8 Fixes #4058 2013-12-18 00:24:21 +10:30
Jeremy Liberman
6afa23a62e Adds tofurkey and stuffing food items 2013-11-28 03:45:13 -06: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
Mloc-Argent
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
DJSnapshot
39387fa3bb Merge pull request #3840 from MDReckless/dev 
Grape Soda addition
 2013-10-29 17:06:16 -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
152d83d47c Update drinkingglass.dm 2013-10-28 15:02:14 -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
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
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
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
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
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
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500. 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-22 12:39:48 +01:00
Mark Aherne (Faerdan)
e0924bf4ab Multiple minor updates to Nano. 
Created new DNA Modifier Nano UI.

Refactored the DNA Modifier code.
 2013-09-19 01:39:59 +01:00
Kilakk
0e08e80bb0 Changed syringes and vials to work correctly with the autolathe 2013-09-08 14:24:06 -04:00
Erthilo
3662725155 Fixes for monkeycubes. 2013-09-02 17:44:47 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
469cc55020 Readjusts pill chems due to overdose. Adds pill dissolve logging. 2013-09-01 20:47:54 +01:00
Erthilo
74c19d4ec8 Added vacuum flask to bar. 2013-09-01 13:24:13 +01:00
Erthilo
03b716e0cd Adds delay to eye dropper. 2013-08-31 22:10:52 +01:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
 2013-08-31 17:45:31 +01:00
Erthilo
a7f1b50f1b Fixes reagent and throw logging. 2013-08-30 00:38:10 +01:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00