cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

TG: Added throwing items over tables, thanks to SkyMarshal.

Browse Source 
Improved cigarette code, mostly grammatical fixes.
Revision: r3036
Author: 	 petethegoat
This commit is contained in:
Ren Erthilo
2012-04-20 00:33:42 +01:00
parent 32a2a6c1f5
commit fea287e1fc
10 changed files with 158 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj.dm
+2
View File
@@ -742,6 +742,7 @@
density = 1
flags = FPRINT
anchored = 1.0
throwpass = 1 //You can throw objects over this, despite it's density.
/obj/effect/shut_controller
name = "shut controller"
@@ -814,6 +815,7 @@
density = 1
anchored = 1.0
layer = 2.8
throwpass = 1 //You can throw objects over this, despite it's density.
New()
..()
code/defines/obj/vending.dm
+1 -1
View File
@@ -161,7 +161,7 @@
product_hidden = "/obj/item/weapon/lighter/zippo"
// product_hideamt = "4"
hidden_prices = "2"
product_coin = "/obj/item/clothing/mask/cigarette/cigar/havanian"
product_coin = "/obj/item/clothing/mask/cigarette/cigar/havana"
product_coin_amt = "2"
product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
charge_type = "cigarette"