cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 13:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,304 Commits 26 Branches 2 Tags
24dceac4efa99150611bc35efbfd39afdeb90fe3
Commit Graph

410 Commits

Author SHA1 Message Date
d3athrow
c8bc025cc7 Fix holywater hurting full power vampires 2014-01-11 04:41:32 -05:00
fleure
27c35cfdac Added spider meat recipes 
Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
 2014-01-11 00:16:12 -05:00
Zuhayr
600bfba275 Colour fix for bread slices. 2014-01-11 00:02:07 -05:00
Zuhayr
2f0cb6635b 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 00:01:34 -05:00
Zuhayr
2cd1580acd Added filling_color var to food items for use in sandwiches. 
Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
 2014-01-10 23:56:24 -05:00
SkyMarshal
e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 
Conflicts:
	code/modules/mining/mine_turfs.dm
 2014-01-09 20:56:38 -05:00
Zuhayr
3789e82f7b Roasted diona, for ZomgPonies/Paradise. 
Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
 2014-01-09 09:14:20 -05:00
alex-gh
404ee2ac1f typo fix 2014-01-09 06:02:45 +01:00
alex-gh
d239894e9b Removed water recipe, reagent fixes 2014-01-09 03:00:05 +01:00
Zuhayr
f66b5a3ccc Removed a return. 2014-01-06 23:47:46 -05:00
Zuhayr
e0d803d158 Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel. 2014-01-06 23:47:21 -05:00
Zuhayr
a8c8bb7fa6 Added NO_BLOOD checks to drips, syringes. 
Conflicts:
	code/modules/organs/blood.dm
 2014-01-06 23:46:58 -05:00
Mark Aherne (Faerdan)
5d04a41151 NanoUI updates. 
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
 2014-01-05 23:28:52 -05:00
Rob Nelson
74e6b51b88 Silver slimes now produce drinks upon injection with water. (#345) 2014-01-05 00:50:20 -05:00
ZomgPonies
227fbc8cbe Changed green slime extract effect 2014-01-04 22:22:12 -05:00
ZomgPonies
1458a5834f Missed a spot 2014-01-04 18:46:23 -05:00
Nanai
bf9ba0f658 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.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
 2014-01-04 15:59:22 -05:00
ZomgPonies
6827a12afe Fire extinguishers can now spray any reagent desired. 2014-01-03 21:22:53 -05:00
ZomgPonies
2c0315a56c Small holy water vamp fix 2014-01-03 20:58:09 -05:00
ZomgPonies
7bbf936f45 Added space cleaner refiller 2014-01-03 14:09:30 -05:00
ZomgPonies
a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -05:00
ZomgPonies
9ad437b8c5 Adding checks for LAssailant everywhere whee 2013-12-23 04:57:44 -05:00
ZomgPonies
21666af24d Organ/Surgery Overhaul Part 2 2013-12-19 08:59:02 -05:00
ZomgPonies
5ce256b73c Organ/Surgery Overhaul Part 1 2013-12-19 07:25:55 -05:00
ZomgPonies
e29afdaf2b Dirt overlay fixes 2013-12-17 07:25:42 -05:00
ZomgPonies
912601a30d Vampire Gamemode! 2013-12-13 19:38:49 -05:00
ZomgPonies
cf6092280a Holiday cheer hats, including Ian versions 2013-12-12 03:52:48 -05:00
Zuhayr
31dd8daaf4 Diona will take five times as much damage from plant-B-gone as previously. 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2013-12-11 04:39:22 +01:00
alex-gh
03a899309a Amatoxin is a slow delayed poison now 2013-12-02 11:30:57 +01:00
ZomgPonies
47135f9adf Added thanksgiving recipes 2013-11-29 07:13:41 -05:00
ZomgPonies
6467bbbb39 Added growing and rolling your own weed, tobacco, tea, coffee 2013-11-27 16:51:04 -05:00
ZomgPonies
449bdf9bd2 Added condiment packs 2013-11-27 07:31:45 -05:00
ZomgPonies
9756d1e311 Fueltanks explode if too hot. 2013-11-24 03:13:10 -05:00
ZomgPonies
53a2925d67 Some new food recipes 2013-11-24 02:30:44 -05:00
alex-gh
84b6c49df9 Fixed typo in boozeomat code 2013-11-21 21:22:23 +01:00
ZomgPonies
1f2a493caa Roman-style ambrosia wreaths 2013-11-14 15:21:24 -05:00
alex-gh
41720c8c2b Fixed an icon bug with booze and soda dispencers. 
Booze and soda dispencers accept glassware now.
Made the selection in booze and soda dispencers more sensible.
Generalised dispencer hacking code.
Added toxins and plasma to hacked chem dispencer.
 2013-11-11 13:34:44 +01:00
alex-gh
9ec8abdcda Updated autoinjectors name and description to reflect their content and purpose 2013-11-09 23:21:13 +01:00
alex-gh
7b90987f79 Autoinjectors now contain tramadol and hyperzine instead of doctors delight 2013-11-09 12:21:57 +01:00
Fox-McCloud
48512911a9 Chem Dispenser (see the beakers) 
Adds a tiny new sprite that allows you to see if a beaker is in the
chemistry machine or not.
 2013-11-04 19:11:28 -05:00
Fox-McCloud
3c8f618380 Minor Tweaks 
Fixes various minor issues here and there (including improper items for
chemistry repair), allows coloration of Tajaran, Unathi, and Skrell
hair+facial hair, and adds a few new food items.
 2013-11-03 00:34:20 -04:00
ZomgPonies
df12d538ac Merge pull request #19 from Fox-McCloud/Hyrdo+Xenoarch-Tweaks 
Hyrdo+xenoarch tweaks
 2013-11-02 15:24:39 -07:00
ZomgPonies
bd48e4c80b Added Chinese Restaurant and barber shop updates, plus some bugfixes 2013-11-02 18:23:07 -04:00
Fox-McCloud
91026fba82 Hydro+Xenoarch+Sprites 
Few changes to Xenoarch finds, adds hydroponics plants, updates a couple
sprites, and removes NT Rep from various traitor lists.
 2013-11-01 23:46:37 -04:00
ZomgPonies
a227fa6cbe Removed zombies, added Skellingtons for halloween. Some bug fixes 2013-10-31 03:21:34 -04:00
ZomgPonies
ed0fb00838 Merge pull request #18 from alex-gh/chem_colors 
Medcines now actually have colors different from pink
 2013-10-30 08:40:45 -07:00
alex-gh
1a27430232 Medcines now actually have colors different from pink 2013-10-30 13:33:55 +01:00
ZomgPonies
d249e3b0c7 Grey Species snowflake code 2013-10-30 05:45:38 -04:00
ZomgPonies
1fe50a4e13 Bugfixes 2013-10-30 03:13:59 -04:00
ZomgPonies
9627cc09c7 Merge branch 'master' of https://github.com/ZomgPonies/Baystation12 2013-10-29 11:57:10 -04:00