Commit Graph

461 Commits

Author SHA1 Message Date
4dplanner 2f1f0da5be Adds another can_inject check just before injecting (#26001)
* Adds another check before injecting/applying medicals stacks

* More helpful comments

* Updates to use extra_checks
2017-04-11 15:25:07 +02:00
Joan Lung 7092702dfc maybe if I fuck with everything it'll get better 2017-04-08 12:41:22 -04:00
Joan Lung bbf14f769d It didn't fix the line endings 2017-04-08 12:40:18 -04:00
Joan Lung 59eae3e871 this is supposed to fix the line endings 2017-04-08 12:36:10 -04:00
Joan Lung fa758dc418 GLOB 2017-04-07 12:25:29 -04: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
Joan Lung fa50886ee2 kill me 2017-04-06 19:43:12 -04:00
Joan Lung bbd81a1a30 eh, no change 2017-04-06 19:30:06 -04:00
Joan Lung 9acc3735c5 with bonus fixes 2017-04-06 19:22:44 -04:00
Joan Lung d4f9d71209 Moves GPSes and bluespace crystals to appropriate folders 2017-04-06 19:03:00 -04:00
ExcessiveUseOfCobblestone 32f957dbf0 Time to use this broken glass on Cyberboss! (#25816)
* CYBERBOSS!!!!

* citrus
2017-04-04 09:07:03 +12:00
anconfuzedrock c4125d88bf anyone want to play some board game online (#25558) 2017-03-31 08:31:49 +02: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
XDTM e49f236457 Raises the medical gauze's max stack size to 12 (#25366) 2017-03-22 19:30:32 -03: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
AnturK e5b964f11e Fixes stack splitting (#24941)
* Fixes stack splitting

* Integrates other bugfix in this
2017-03-13 11:34:15 +13:00
Lzimann 5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
coiax 6e39f5cf00 Stacks automatically merge on Initialize (#24810)
* Stacks automatically merge on Initialize

🆑 coiax
fix: Stacks of materials will automatically merge together when created.
You may notice differences when ejecting metal, glass or using the cash
machine in the vault.
/🆑

Okay, so instead of just obsessively checking every time we make a
stackable item to see if anything stacks (which not everything does
anyway), we put the check in Initialize. Obviously, you can't merge into
a full stack, so it just goes down the line.

Objects are allowed to qdel() in New/Initialize, we made that a thing
that was possible.

Also some generic code cleanup, mostly returns into `.`

* Don't reuse variable names
2017-03-10 09:46:21 +13:00
PKPenguin321 3a1b0b2b6c Adds a new arcade prize, take two (#24660)
* adds fake chasm tiles

* adds to arcade machine list

* swood this

* swood that
2017-03-08 11:19:53 +13:00
oranges e575a9ac52 Merge pull request #24751 from Cyberboss/patch-20
Fixes the dumbest shit I've ever seen
2017-03-08 09:10:45 +13:00
Joan Lung f36940d1c0 Circuit tiles now glow faintly (#24722)
* Circuit tiles now glow faintly

* one missed
2017-03-07 21:04:04 +01:00
Cyberboss c9eb5b86f0 Fixes the dumbest shit I've ever seen 2017-03-06 15:17:35 -05:00
Lzimann e58ee1724f Refactors logging into a single var for all mobs and adds a wrapper for proper logging. 2017-03-04 13:32:35 -03:00
Cyberboss 2a8e5ff4cb Fixes a very annoying spawn (#24588)
* Fixes a very annoying spawn

* Yeah whatever
2017-03-03 10:38:15 +13: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
Lobachevskiy 371b96bf62 Makes buckled and flying mobs avoid glass shards 2017-02-14 23:34:07 +03:00
anconfuzedrock f8d9e14832 Adds crafting blindfolds, hacked autodrobes contain a blindfold and muzzles (#23953)
* I didn't want to make muzzles come from the autodrobe but I couldn't think of where else it could go

* Update vending.dm

* Update vending.dm

* Update sheet_types.dm
2017-02-12 17:55:05 +01:00
bgobandit c75a97cd50 You can no longer take non-integer amounts of sheets from a stack. (#23908) 2017-02-10 12:16:23 -06:00
Cyberboss 18073f8880 Fixes stacks being deleted when merged in storage (#23758) 2017-02-07 16:16:42 -06:00
bgobandit ef2921b1c3 Adds picture frames. (#23168)
* Adds picture frames.

* Fixes bugs in photography

* clicking a photo views the photo, more consistent with other wall items
2017-01-31 09:33:07 +13:00
Cyberboss 3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
Supermichael777 17f6284d8d Ports Tiki mask from Hippie and adds the alt version of the wooden chair to the crafting menu. (#23161)
tweak: The wooden chair with wings is now craft-able. -1 non reconstruct-able map object

add: Added the Tiki mask, you can make it in wood's crafting menu.

imageadd: Ported Tiki mask's sprites from Hippie station. It is under the same Creative Commons 3.0 BY-SA as the rest of our sprites. They are from Nienhaus.

For the mask the reason is UNGA-BUNGA. For the chairs I just hate map objects that players can't fix.
2017-01-30 09:47:06 +13:00
Cheridan c9fad927a9 Merge pull request #23245 from ChangelingRain/windowdressing
You can no longer stack multiple windows of the same direction on a tile
2017-01-27 17:27:25 -06:00
coiax 338e67808e You can now buy telecrystals in stacks of 5 and 20 (#22818)
🆑 coiax
add: Telecrystals can be purchased in stacks of five and twenty.
add: The entire stack of telecrystals are added to the uplink when
charging them.
/🆑
2017-01-26 13:37:22 +01:00
Kyle Spier-Swenson 12570805bd Closes the Pool. (#23150)
* Delete pool.dm

* Removes usage of PoolOrNew

* Wrap up
2017-01-22 16:00:23 -05:00
Joan Lung 0633e79042 You can no longer stack multiple windows of the same dir on a tile 2017-01-22 13:43:39 -05:00
oranges f4e325e5ed Merge pull request #22765 from Mervill/the_kilt_is_now_op
Hardsuits, amour and other suits that cover the feet now protect against glass shards
2017-01-12 13:54:32 +13:00
XDTM 64e4994fea Fixes material amount (#22954) 2017-01-11 19:51:13 -05:00
Mervill 646d4bc8ee hardsuits, amour and other suits that cover the feet now protect against glass shards 2017-01-05 02:48:40 -08:00
Mervill 49d51da5c5 adds weightclass2text(), updates package names based on item size 2017-01-02 18:02:40 -08:00
Cruix ba1ff745b1 Fixed being able to pull lockers out of wrapping paper (#22648) 2017-01-02 16:58:01 -05:00
oranges a5a5dcdeba Merge pull request #22416 from Militaires/kill_me
fixes my glass message tweak fuck-up
2016-12-25 16:20:03 +13:00
AnturK 85669e6746 Implants work on /living mobs (#22392) 2016-12-24 13:44:34 -05:00
militaires edc58d99ac aaaaaaaaaaaaaa haaaaaaaaasaaaaaaaaaaaayaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2016-12-22 16:52:34 +03:00
Mervill 8daf8eab09 The light replacer can now consume glass shards (#21993)
* The light replacer can now consume glass shards to create bulbs

* woops

* Buff glass shards to be worth %75 precent of a glass sheet (currently 3)
2016-12-09 09:08:03 +13:00
Militaires 9bedd7d414 fixes people "walking over the glass shard!" when they're on the ground, changes message. (#21918)
* hopefully one and only commit

* i fail myself once again

* done

* me a dumbass!
2016-12-07 09:39:01 +13:00
Joan Lung 12aa57fd7e You can now proselytize floor tiles 2016-12-03 17:03:29 -05:00
Mervill c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00