Commit Graph

302 Commits

Author SHA1 Message Date
Jordan Brown
641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
Jordan Brown
47e1cfb179 Merge pull request #29934 2017-08-17 10:12:51 -04:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown
fab63821f5 Fixes weaponcrafting repath 2017-08-16 12:15:08 -04:00
ShizCalev
bfe27a5f98 Merge branch 'master' into crafting-fixes 2017-08-16 11:19:30 -04:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
shizcalev
9a6d79f73b Fixes leathercrafting 2017-08-15 16:36:37 -04:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
BeeSting12
0fb80e97b3 fixes a couple issues 2017-07-26 14:38:44 -04:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Joan Lung
1feb0021a1 Removes now-unnecessary obj_integrity definitions 2017-07-08 14:02:50 -04:00
MoreRobustThanYou
b96bc440db Fixes plasma glass merging with normal glass (#29114)
* Fixes plasma glass merging with normal glass

* Update window.dm

* Update smelting_designs.dm
2017-07-08 10:44:32 -04:00
MoreRobustThanYou
aa7c60eb1f Ports plasma glass windows from /vg/ (#29024)
* add plasma window textures

* plasma glass sheets

* Update glass.dm

* Update window.dm

* Whoops!

* Update glass.dm

* Update glass.dm

* UHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH

* this is what I get for coding while being awake for nearly 24 hours

* SMOOTHIES

* Update window.dm

* return return RETURN

* who cares

for some reason paperframes had trues and all that... i hate byond

* updated dmi snoothie thins

* Add files via upload

* thanks @Cyberboss- thump... zzzzzzzzzzz

seriously i am so tired right now

* AYYYy yayyy I SAID YEAHHHH, what's GOIN ONN

* Update glass.dm

* EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

* ooga booga

* Update window.dm

* Update smelting_designs.dm

* Update smelting_designs.dm

* Update glass.dm

* Update window.dm

* Update glass.dm

* reee

* WHOOPS!

* Well, if ya say so

* Update glass.dm

* Update glass.dm

* uhhh....?

* Update window.dm

* Update glass.dm

* Add files via upload

* Update window.dm

* Update glass.dm
2017-07-04 22:27:58 -04:00
Jordan Brown
917ca588a8 Fixes cardboard tube duping 2017-06-29 14:13:18 -04:00
KorPhaeron
e8d425b227 Robotic limbs are not weak to glass 2017-06-24 15:53:30 -04:00
bawhoppen
b666bd58b0 Makes dressers buildable (#28611) 2017-06-21 09:45:04 -03:00
Joan Lung
2672d88800 Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects (#28524) 2017-06-18 23:03:51 -03:00
Ashe Higgs
a405334588 Construction alien closets now consumes two alloy (#28573) 2017-06-18 21:20:06 -04:00
Expletive
1860e1a2ea Paper frames, but with new sprites. (#28452)
* Paper frames, take two

* With entirely new sprites

* and basemap

* no directional doors also smoothing

* changes requested

* woops

* deconstruct -> Destroy
2017-06-18 10:45:35 -04:00
TrustyGun
1db56a3d58 Clown Toy Box + Wooden Crates (#28227) 2017-06-09 13:01:51 -03:00
ShizCalev
f2d829261a [Typo] Duffel Bag (#28200) 2017-06-08 19:16:20 -03:00
Expletive
3f62253b3b Adds sprites for certain lavaland stacks and adjusts their max_amounts 2017-06-02 07:39:08 -07:00
Expletive
b928177ea5 Stacks will change sprites and w_class based on how full they are. 2017-06-02 02:55:41 -07:00
Joan Lung
5387d795a8 Splits up mine_items.dmi (#27669) 2017-05-26 15:19:16 -03:00
QualityVan
a2c0e7e592 Water wets hide, you can microwave wet leather (#27546)
* Water wets hide, you can microwave wet leather

* microwave output
2017-05-23 23:18:20 -06:00
Joan Lung
2b436e4b6b Merge pull request #27271 from coiax/cult-supply-talismans
Refactors supply talismans to be less shitcode
2017-05-15 18:53:29 -04:00
Expletive
6f88d224ec Adds a few new recipes created with plastic sheets (#27257) 2017-05-15 09:02:24 -03:00
Jack Edge
fea3dd0ffe Refactors supply talismans to be less shitcode
- A used supply talisman makes a pile of ash when it's used up
- Weak supply talismans no longer have a "runed metal" option that
doesn't work.
- The generation of the talisman menu is now dynamic.
2017-05-14 20:18:44 +01:00
swindly
86a6c47371 Buffs plasma and nerfs snow (#27147) 2017-05-12 17:13:40 -03:00
Joan Lung
3711b58f36 Harvesters are more fun to play (#27086) 2017-05-10 12:18:15 -03:00
coiax
15cd682eef Makes it clear whether (in)complete golem shells are free or servant (#27025)
* Artifical golem shells now have "artificial" in the name

So it's clear whether you're becoming a free or an enslaved golem.
2017-05-08 15:56:47 -03:00
oranges
7436d7d990 Merge pull request #26854 from FantasticFwoosh/LeatherClub
Refactors leather with crafting, removed bio-generator designs + adds craftable muzzles
2017-05-08 20:04:23 +12:00
Jack Edge
0c72dc1ab9 Make adamantine with adamantine slime cores 2017-05-05 18:08:40 +01:00
oranges
1a5fbe2277 Merge pull request #26808 from FantasticFwoosh/AstroHellTurf
Adds aesthetic basalt floor tiles
2017-05-04 23:11:30 +12:00
FantasticFwoosh
27dedd6d6b Fixes syntax to compile
No jokes allowed; killjoys. I have tested it and it now compiles.
2017-05-03 17:19:12 +01:00
FantasticFwoosh
1c7503dbcb Creates a global craft list for leather + muzzle
Adds the muzzle object to global crafting & other leather objects ported from biogen (some not all)
2017-05-03 15:58:12 +01:00
FantasticFwoosh
2d82d3d597 Adds fake basalt floor tile to sandstone recipies
Without meaning to split sand and ash (since they are not distinct enough) it is fair to add it to the relevant recipe of sandstone, mainly since you can dig up the turf the patch it over again
2017-05-02 08:24:07 +01:00
Leo
3b9b4e0755 Changes a bunch of hrefs to the proper defines (#26760) 2017-05-02 01:19:51 -06:00
Joan Lung
57f8e92957 Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass (#26725) 2017-05-01 00:23:50 -03:00
Jack Edge
133173c67c Removes adhoc types 2017-04-22 22:07:51 +01:00
c0
5c6b32cbc3 Refactors picture frames to use wall frames system 2017-04-17 15:37:05 +03:00
Cyberboss
9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
ExcessiveUseOfCobblestone
32f957dbf0 Time to use this broken glass on Cyberboss! (#25816)
* CYBERBOSS!!!!

* citrus
2017-04-04 09:07:03 +12:00
kevinz000
465f136b96 [READY]Planetstation: Floodlights (#25310)
* floodlights

* floodlights

* ...

* copypasta

* traviscaughtmenottesting

* fixes

* set_light

* fixed

* construction

* strings

* kay

* Update floodlight.dm

* Update floodlight.dm
2017-03-29 18:09:33 +13:00
Leo
005f8f1889 Fixes sheets runtiming on ORM (#25464) 2017-03-25 15:29:09 -04:00
Leo
c7da35d9d5 Ports stacks and sheets to initialize (#25224) 2017-03-19 15:54:26 +01:00
octareenroon91
c4d42e8a8a Allow reflector construction (#25084)
New reflector frames can now be built at will.
2017-03-14 20:46:56 -04:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Cyberboss
c9eb5b86f0 Fixes the dumbest shit I've ever seen 2017-03-06 15:17:35 -05:00
coiax
82e123a227 Adds plastic, makes plastic flaps constructable and deconstructable (#24257)
* Adds plastic, makes platic flaps constructable

🆑 coiax
add: Cargo can now order plastic sheets to make plastic flaps. No doubt
other uses for plastic will be discovered in the future.
/🆑

Later maybe we can make cable coils use plastic and metal, rather than
metal and glass. And make plastic tables. And make foam darts use
plastic rather than metal. And make spray bottles out of plastic. And
cheap plastic tables. And cheap plastic chairs.

Why? Because plastic makes sense as a material that you can make stuff
out of, and those DAMNED PLASTIC FLAPS AREN'T CONSTRUCTABLE.

* New plastic sheets sprite (STOLEN FROM BAY)

* Making plastic flaps takes time

* Constructable flaps

* Deconstruction time like walls
2017-02-25 15:54:09 +13:00