Commit Graph

212 Commits

Author SHA1 Message Date
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
Cyberboss
78ee754da3 Merge upstream 2017-04-01 23:38:37 -04:00
Cyberboss
b28ee72a47 Fixes smartfridges 2017-03-30 22:51:04 -04:00
Cyberboss
d0bfbc3e13 Rename ticker to SSticker 2017-03-22 10:48:25 -04:00
AnturK
e1d7eff8ff Fixes air runtime and adds air flow blocker for mappers (#24932)
* Every time.

* comment grammer
2017-03-13 11:36:45 +13:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Pieter-Jan Briers
1956ace5c7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-19 15:10:23 +01:00
Cyberboss
1365ab99d8 Merges map templates and map loader (#24140)
* Reorganize the mapping code

* Finish this up

* Reee line endings

* FUCKING LINE ENDINGS

* LINARU ENDARU

* >PLS SET REPO LINE ENDINGS

* Comments

* Hoisted by my own travis.yml changes
2017-02-19 16:55:02 +13:00
Pieter-Jan Briers
9b20c1e6c2 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 23:40:34 +01:00
GunHog
347b384977 Aux Base Improvements (#24146)
* Aux Base Improvements

- The Base Management Console (BMC) may now set up its own landing zone
at random if mining has not prepared a drop zone.
- The BMC may now control the Perimeter Defense Turrets built by the
construction console. Their status and health may be checked from the
BMC as well.
- The PDTs now have slightly increased damage and fire through glass.
- Moved the BMC to its own file.
- Changed the path of the BMC in order to function properly as its own
computer type.
- The Aux Base's dock now doubles as a public mining shuttle dock once
the base is dropped and shuttle landing beacon set up. Controlled from
the BMC.
- Removed access requirements from the Box station mining shuttle to be
compabile with the public dock.
- Added a base construction console to Deltastation, moved the shuttle
beacon inside of the base, and moved a potted plant.

* Fix Maps

Fixes conflicts by redoing my previous edits

* Fix Maps again

Forgot to use the correct docking port, and remove access from one of
the Delta station mining shuttle doors

* Fix Pubby

My lack of experience with maps shows again!!

* 3/4 Suggested Changes

- Cleans up some code

* Final requested change

Href exploit prevention I guess?
2017-02-18 20:37:38 +01:00
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01: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
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
PJB3005
e2386a8bd8 Have some code 2017-01-17 22:54:05 +01:00
Kyle Spier-Swenson
bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
bgobandit
f64e3f8688 Adds a sprite for a survival pod fridge with the panel open (#22375)
* Adds a maintenance panel to the survival fridge panel, will probably need to be fixed

* I'm a goddamn clairvoyant (fixed)
2016-12-23 09:38:46 +13:00
XDTM
7d1a67d0c8 Abductor tools and tool sound refactor. (#22125)
* Everything in the PR

* I'm taking that as a yes
2016-12-14 18:09:41 +13:00
Joan Lung
a3be7a9226 Refactors toolspeed to be a multiplier instead of a divisor 2016-12-09 16:55:51 -05:00
Kyle Spier-Swenson
dedb16826e Speeds up world init. (93s -> 49s) (#21992)
* Speeds up world init.

* Armor is now new inited for obj and the first level of subpaths.
* Actions is now lazyinited and deleted with empty.
* Actiontypes is now only inited when actually used and deleted once it pre-fills actions with the action buttons.
* Pipes now prefill their node list(s) in new() using new /list/ (count) syntax to speed up the list initaliztions and remove the init proc.
* Pipes no longer store their item version, instead creating it on the fly when deconned
* Walls no longer store their metal stacks, instead creating it on the fly when deconned.
* obj, walls, floor, plating, item, machinery, structure, pipe, pipenet, atom, and movable no longer have an (init) proc. (along with a few other smaller examples)
* Atmos can pass checking is now a var with the ability to have a proc be call in advance cases.
  * (as a side effect, I had to fix a few things that were calling atmosCanPass rather then using the pre-calculated list, this should speed up chemfoam and flame effects greatly)

* Reverts upload limit
(remind me one day to defuck this, it could easily be a config thats not editable by vv to make changes easier)

* Makes apc update icon a bit faster.
APC new is some what high on the profile of world init, still not sure why, but this stood out as a waste of cpu so i fixed it.

* Fixes runtime with atmos backpack water tanks.

* Makes smoothing faster (and fixes turfs smoothing twice at init)

* Makes apcs init faster by replacing some spawns with addtimer

* fix transit turfs.
2016-12-08 21:50:15 +13:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
kevinz000
5bf5426f4a Update mine_items.dm 2016-11-05 17:22:01 -07:00
kevinz000
bda1dda20e Update mine_items.dm 2016-11-05 17:21:49 -07:00
kevinz000
f1ee75b18b Update mine_items.dm 2016-11-05 03:05:29 -07:00
AdamElTablawy
5b2bedcb51 adds cargo and engi access to allowed accesses for launching mining aux base (#21048)
* cargo, engi, and head access added to aux mine base

* FUCK
2016-10-21 15:14:47 +13:00
phil235
6cfd99ec00 Moving shit around and APC repair bugfix (#20912)
* Moving shit around so turfs aren't defined in code/modules/mining .
Fixes APC's integrity not being reset to max when a broken APC is repaired.

* derp

* More turf and turf procs moved.

* fixing merge conflicts again.
2016-10-12 09:48:47 +02:00
TechnoAlchemist
d434ac96f4 Merge branch 'master' of https://github.com/tgstation/tgstation into alchemy_pt_1
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/modules/mining/lavaland/ash_flora.dm
2016-10-10 13:20:25 -07:00
phil235
5f835bfc26 Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)
Please refer to #20867 and #20870 for a easier view of the changes. Those two PRs show all meaningful changes (hopefully) and doesn't show the files changed with just 3 lines changed.

This PR does three things:

    It makes all children of /obj/ use the same damage system.
    Previously to make your new machine/structure be destroyable you needed to give it a var/health, and its own version of many damage related proc such as bullet_act(), take_damage(), attacked_by(), attack_animal(), attack_hulk(), ex_act(), etc... But now, all /obj/ use the same version of those procs at the /obj/ level in code/game/obj_defense.dm. All these obj share the same necessary vars: obj_integrity (health), max_integrity, integrity_failure (optional, below that health level failure happens), and the armor list var which was previously only for items, as well as the resistance_flags bitfield. When you want your new object to be destroyable, you only have to give it a value for those vars and maybe override one proc if you want a special behavior but that's it. This reorganization removes a lot of copypasta (most bullet_act() version for each obj were nearly identical). Two new elements are added to the armor list var: fire and acid armor values.
    How much damage an obj take depends on the armor value for each damage category. But some objects are INDESTRUCTIBLE and simply never take any damage no matter the type.
    The armor categories are:
    -melee(punches, item attacks, xeno/animal/hulk attacks, blob attacks, thrown weapons)
    -bullet
    -laser
    -energy (used by projectiles like ionrifle, taser, and also by EMPs)
    -bio (unused for this, only here because clothes use them when worn)
    -rad (same)
    -bomb (self-explanatory)
    -fire (for fire damage, not for heat damage though)
    -acid
    For machines and structures, when their health reaches zero the object is not just deleted but gets somewhat forcedeconstructed (the proc used is shared with the actual deconstruction system) which can drops things. To not frustrates players most of these objects drop most of the elements necessary to rebuild them (think window dropping shards). Machines drop a machine frame and all components for example (but the frame can then be itself smashed to pieces).
    For clothes, when they are damaged, they get a "damaged" overlay, which can also be seen when worn, similar to the "bloody" overlay.

    It refactors acid. See #20537.
    Some objects are ACID_PROOF and take no damage from acid, while others take varying amounts
    of damage depending on their acid armor value. Some objects are even UNACIDABLE, no acid effect can even land on them. Acid on objects can be washed off using water.

    It changes some aspect of damage from fires.
    All /obj/ can now take fire damage and be flammable, instead of just items. And instead of having just FLAMMABLE objs that become ON_FIRE as soon as some fire touch them (paper), we now have objects that are non flammable but do take damage from fire and become ashes if their health reaches zero (only for items). The damage taken varies depending on the obj's fire armor value and total health. There's also still obj and items that are FIRE_PROOF (although some might still be melted by lava if they're not LAVA_PROOF).
    When a mob is on fire, its clothes now take fire damage and can turn to ashes. Similarly, when a mob takes melee damages, its clothes gets damaged a bit and can turn to shreds. You can repair clothes with cloth that is produceable by botany's biogenerator.

    It also does many minor things:
        Clicking a structure/machine with an item on help intent never results in an attack (so you don't destroy a structure while trying to figure out which tool to use).
        I moved a lot of objects away from /obj/effect, it should only be used for visual effects, decals and stuff, not for things you can hit and destroy.
        I tweaked a bit how clothes shredding from bombs work.
        I made a machine or structure un/anchorable with the wrench, I don't remember which object...
        Since I changed the meaning of the FIRE_PROOF bitflag to actually mean fire immune, I'm buffing the slime extract that you apply on items to make them fire proof. well now they're really 100% fire proof!
        animals with environment_smash = 1 no longer one-hit destroy tables and stuff, we give them a decent obj_damage value so they can destroy most obj relatively fast depending on the animal.
        Probably a million things I forgot.

If you want to know how the damage system works all you need is the three obj vars "obj_integrity", "max_integrity", "integrity_failure", as well as the armor list var and the resistance_flags bitfield, and read the file obj_defense.dm
2016-10-10 11:14:59 +13:00
TechnoAlchemist
85b9baff24 Modifies some reagents(Gets rid of the stims in tinlux), adds bio bag to mining lockers, comments out prepare code, allows bio bags to be stored in belts. Allows for shaving mushrooms to spawn. 2016-09-30 12:47:11 -07:00
phil235
2d2975f783 Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
This just adds some vars that the refactor will use. Putting this in a separate PR prevent the damage refactor PR from becoming too big (number of files changed) and hard to read and review.

Introduces the resistance_flags bitflag that replaces unacidable and burn_state.
Moves the armor var from item to /obj level and gives specific armor values to many objects, the armor list also gets two new armor types: fire and acid, which will be used in the refactor. the new fire and acid armor values are given to plenty of items.
2016-09-27 22:33:08 +02:00
Joan Lung
0067bd1332 Adds brass, used to construct various brass objects (#20419)
* Adds brass, used to construct various brass objects

* brasshole

* give em the brass

* give em more brass

* DYNAMIC

* VAR MURDER SPREE

* brassy

* acceptaphil

* this is super against my general preferences but eeeeeh sure okay i guess
2016-09-13 12:16:28 +02:00
Joan Lung
7711fba9bd The Hierophant (#19921)
* HIEROPHANT

* whoops

* that'd be hilarious but unwise

* BIRD_SCORE

* density

* BIRD THREAT

* maybe a threat tm

* danger boss

* it's always the paren

* bird murder

* recall

* no message

* yelling bird

* time
time
come on, time
time
shades

* A ruin!

* I think five blasts is enough

* birdboss wants you dead

* giant boss arena

* hierophant no longer literally unfightable

* smaller ruin?

* no longer innate

* can toggle friendly fire, teleport is AoE

* comments!

* just fucking spawn the arena wew

* heal on resetting

* not as common

* I cannot be trusted

* eeeh

* !

* keep it off the station

* as common as sin

* stop cheesing the boss you asshole

* this looks better

* that ruin didn't even exist what the fuck

* wew

* rip

* it doesn't need full healing if it heals for half when it resets

* good for fighting mobs

* rune where you are

* mechanics; armor doesn't fucking matter rip you

* armor matters but not much so

* )

* meaner than hell and more likely to kill you

* remove those beasts from my beautiful square house

* fix

* you should be able to tell what it's doing, even if you can't actually react to it
being totally unable to tell what the fuck just killed you is bad design, you should know how you died even if you couldn't do shit
rip 3x3 chaser

* start higher scale to the same

* the ruin that doesn't exist and costs 10 points to place

* now what's all this commented out stuff hmmmmmmmmmmm
what could it possibly be

* accurate

* tracking

* boring unused lore

* it needs to be open, oranges. open.

* I did that specifically to note which commit it was on ree

* oh there's a proc for that. duh.

* logging is good

* horrifying

* the marginal kindness of a giant bird boss

* ruin tweak

* idiot bird

* adjust
2016-09-05 10:05:35 +12:00
GunHog
0575213666 Tweaks Aux Base Stat Logging
Aux Mining Base stat logging actually works now, and includes the
coordinates where the base lands.
2016-09-02 14:36:28 -05:00
oranges
251848232f Merge pull request #20100 from GunHog/Colony_Drop_Fixes
More Mining Base Tweaks
2016-08-28 12:38:12 +12:00
GunHog
42e052af64 More Mining Base Tweaks
- The remote now no longer has its own dimension settings, it depends
entirely on the map now
- Fixed the mining shuttle turning its docking point into LAVA
2016-08-25 08:24:17 -05:00
Cheridan
c68ef5909d Merge pull request #20045 from TechnoAlchemisto/dads_coma_was_the_best_thing_to_ever_happen_to_this_family
Places mining scanners above mining satchels in miner lockers. Also minor sprite changes
2016-08-23 23:02:01 -05:00
GunHog
d8f31dbb55 Aux Mining Base Tweaks (#20015)
* Aux Mining Base Tweaks

- Multiple landing zones may now be set for the mining base.
- The coordinates of each landing zone is shown in the list.
- Miners now each get a remote in their starting lockers.
- The Aux mining base now requires lighting while on station
- The Aux Mining Base now has a GPS signal.

* More tweaks

- The shuttle landing beacon no longer requires line of sight, just a
distance check.
- Beacon now has a description.
- Landing site name updated
- Adds support for stat logging base drops.

* Mining Shuttle Interface

- The aux base can now interface with the mining shuttle once the
shuttle beacon is deployed near the base.
- Updated descriptions to explain this.

* Launch Warning

Keeps the launch warning without it going off each time it is used to
move the mining shuttle.
2016-08-23 17:25:01 +12:00
TechnoAlchemist
77811d5b92 Places mining scanners above mining satchels. 2016-08-22 15:26:59 -07:00
KorPhaeron
4bbfa163dd Aux Base Fix 2016-08-18 16:02:37 -05:00
WJohn
b1dc6cd5b7 Adds aux mining base. (#19892)
* First part of fixes and nondescript shit who even reads these

* all done
2016-08-18 12:54:58 +12:00
GunHog
bd8784a027 Adds Do_After and Announcement
- Adds Do_After as comfirmation of setting the colony's location.
- Adds an announcement for when the drop zone is set.
2016-08-03 18:09:07 -05:00
GunHog
ff9f10a74c Whoops
>Gun Hog in charge of math
2016-08-02 10:59:55 -05:00
GunHog
db6b95973e Tweaks
- Adds Xhuis' suggestion for a badmin version
- Restricts dropping colonies on ruins without being fully inside them.
2016-08-02 10:57:12 -05:00
KorPhaeron
bed2a5dae4 Can't launch the colony as the clown 2016-07-30 23:39:11 -05:00
KorPhaeron
7111c4391f Adds disguting tumours to meta and box, lets RD and engineering build in those tumours 2016-07-30 20:14:51 -05:00
Shadowlight213
5f10739385 Repaths satchels and lets angels equip them (#19371)
Repaths satchels so all the different ones are children of the normal satchel.
Allows angels to equip satchels since the satchels are on the side of the body instead of the back. Should help miners who find the potion out a bit.
2016-07-22 10:10:30 +12:00
oranges
8d939ceebf Merge pull request #19051 from Incoming5643/lavaland_can_wait
Reduces the odds of the hilarious (but tragic) 3 minute rev rounds
2016-07-04 13:56:20 +12:00
Incoming
192509a926 Head Revs that attempt to move the mining shuttle around will get a one time reminder that leaving on it might cause them to lose the round and end the game. They can then choose to disregard the warning and lose the round anyway.
This warning happens regardless of whether or not the head rev is the only (living) rev head, as to do otherwise would allow a rev head to gain knowledge on these things in a painless way.
2016-06-30 12:41:09 -04:00
bgobandit
f4beb93752 Fixes dusty smartfridge storage icon (#18971) 2016-06-28 09:21:34 -04:00
Core0verload
e78451796f Mining tweaks, fixes and balance changes (#18697)
Tweaks and QoL changes:
    Kinetic accelerator now supports seclite attachment.
    Miners now have a special heavy duty headset, it differs from regular supply headset only in sprite.
    Miner's roundstart crowbar now spawns in box instead of backpack.
    Preserved legion core no longer sparks and has a telling desc.

Balance changes:
    All cyborgs are now ash-proof. Mining cyborg starts with ash-proof sprite to fit dark mining style. All borgs are superior to humans at their module's job, it makes sense for mining cyborg to come with ash-proof hull by default - after all, mining borgs can't deploy shelters to sit out ash storms.
    Ash-proof plating upgrade was replaced with Lavaproof tracks. This upgrade allows mining cyborgs to roam lava safely.
    Mining cyborg module now includes a tiny welding tool for basic self-repair. This welding tool holds 4 times less fuel than the one used by engineering cyborgs. It also includes a small fire extinguisher.
    Miners start with a box of 3 brute and 1 burn paths instead of a single brute patch. This compensates for recent path nerf that dropped amount of reagents in single path more than in two.
    Explorer's belt slot amount is increased by one, while mining belt crafted from sinew still has 5 slots.

Fixes:
    Updates miner's corpse and mining wardrobe with new lavaland gear.
    Fixes envy's knife path.
    Fixes wing potion's misguided racism.
    Fixes #18796. Fixes legion's nullspace corpse drop bug and two related runtimes.
2016-06-28 21:58:57 +12:00
Cruix
ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +12:00