Commit Graph

991 Commits

Author SHA1 Message Date
ShizCalev
7a2e5fdb2d Fixes immoveable rod move force (#40551) 2018-09-29 23:25:45 -04:00
XDTM
1553afab24 [Ready for review]Adds credit holochips to replace magic cash (#40462)
cl XDTM
add: Added credit holochips, a form of semi-physical currency to use in transactions. They can be generated by id cards by drawing from bank accounts and can be used to make payments.
add: There is no limit to the amount of credits that can be stored on a holochip, but being holograms they are vulnerable to electromagnetic pulses, and may disappear if exposed to one!
add: Holochips can be split with alt-click, and can be merged by clicking on another holochip.
/cl

Inserting physical cash into ids and printing it on the go is really jarring, and since we're on a sci-fi universe i think that hard-light hologram chips with encrypted credits sounds more believable.

As a plus, they don't have to deal with messy stack calculations with different denominations, and simply have a credits var that holds their amount. They change color based on the amount of cash for easy recognizability.
2018-09-26 10:35:02 +12:00
Iamgoofball
f735a7d34d [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 02:50:51 -04:00
AnturK
a27be2fa14 Objective refactor (#40220)
* Objective refactor

* Custom antag types for leftover objectives.

* Removes dumbness.

* Forgot to hide these from TP

* Makes the list static.
2018-09-20 11:18:59 -04:00
Tad Hardesty
3b7549adc3 Set the default port name for navigation computers (#40277) 2018-09-15 05:56:35 -04:00
ShizCalev
8a7df8ba45 Makes usage of Nar-Sie consistent (#40029)
cl ShizCalev
spellcheck: Nar-Sie's name has been revised to Nar'Sie.
/cl
2018-09-08 13:31:09 +12:00
81Denton
523ebb1adf Add bomb defusal shuttle loan event (#39881)
This is a shuttle loan event where CentCom asks you to defuse an active
syndicate bomb.

The good part? It pays a lot of dosh.

The bad part? You have a real chance of dying, blowing up the supply shuttle
and tearing a big fukken hole into cargo bay.

Maybe cargo techs will step back for a second and think "is the money really
worth that risk"?

Anywho, I blacklisted syndie bombs from cargo exports (so people can't just
send it back to CentCom) and also moved shuttle loan related items into
shuttle_loan.dm.
2018-08-25 02:06:18 -07:00
AnturK
bd72eb3371 Refactors exports and pirate loot gathering. (#39749)
* Pirate export

* Stuff

* ATTEMPT TWO

* Vault area was removed look for control terminal here.

* Fixes and improvments

* cb stuff
2018-08-24 12:50:53 +03:00
ninjanomnom
2fbfdd03d2 Handle shuttle registration from inside the template 2018-08-19 22:20:23 -04:00
Patrick Chieppe
2c8248575a Logging system refactor and improvement (#39521)
* Refactor several log lines to use datum_info_line and atom_loc_line

* Add default return strings from datum_info_line and atom_loc_line

* Add parentheses around atom_loc_line data

* Change more logs to use atom_loc_line

* Add check in atom_loc_line for turfs to avoid calling get_turf on them

* Re-add removed 'at'

* Replace datum_info_line with key_name and atom_loc_line with loc_name

* Refactor logging functions

* Avoid double-logging self-interactions

* Fallback to simple stringification if all else fails in key_name()

* Rewrite muscle spasm logging to use log_message

* Standardize logging of martial arts

* Tweak individual logging panel look

* Fix individual logging panel source

* When I typed || I really meant &&

* Fix Telecomms logging always showing client logs in the panel

* Reverts addition of buggy ownership log to panel

* Remove colon

* Fix missing log_directed_talk tag

* Add warning for missing type in log_direted_talk

* Change warnings to stack_traces

* Add square brackets around fallthrough key_name() case to help parsing

* Allow atom arguments/src in log_*() functions

* Change log_combat call with null argument to log_message

* Change mecha types' log_message() arguments to match atom and mob version

* Add key_name() case for atoms

* Fix resist_grab() unsetting pulledby before log_combat gets a chance to use it

* Fix log_globally logic

* Add logging for hitting objects with items

* Move log_combat() to atoms.dm

* Use utility functions for object stringification in log_combat()

* Use utility functions for object stringification in log_combat()

* Add missing logs for interacting with display cases

* Rewrite log_combat() comment

* Add missing space in log_combat()

* Add logging for hitting grilles barehanded

* Add missing ..()
2018-08-12 21:41:09 +02:00
Jordan Brown
45ec7d38af Merge pull request #39481 from AutomaticFrenzy/patch/syntax
Fix some weird syntax
2018-08-02 17:26:58 -04:00
Emmett Gaines
e248d342b8 Removes the shuttle timid var (#39445)
Now that shuttles are all loaded via template we no longer have a need for the
timid var on shuttles.

Well not all shuttles, it seems I forgot to template the backup shuttle so it
wouldn't have been working until now. This got fixed here as well.
2018-08-01 21:19:16 -07:00
Tad Hardesty
2552190fbf Fix some weird syntax 2018-07-31 01:24:31 -07:00
bgobandit
8f71d71f1e Fix more spelling/grammar (#39450)
self explanatory
2018-07-29 16:19:42 -07:00
vuonojenmustaturska
690314b048 let's decontaminate 2018-07-15 16:04:25 +03:00
Jordan Brown
f426bea834 Pizza delivery event now has a chance to add nanomachines to a pizza (#39070)
* Pizza delivery event now has a chance to add nanomachines to a pizza

* Simplified pizza spawning
2018-07-13 12:09:31 -04:00
Jordan Brown
d0184129b2 Merge pull request #38982 from 81Denton/shuttle-loans
Adds a new shuttle loan event, tweaks others
2018-07-12 12:01:51 -04:00
Jordan Brown
96c92d5eb7 Merge pull request #38938 from ninjanomnom/b-b-bump
Converts collide back to bump and fixes double bumping in another way
2018-07-09 14:50:27 -04:00
Denton
6bb8eb514d just bee urself 2018-07-08 09:33:13 +02:00
ninjanomnom
059da44453 Converts collide back to bump and fixes double bumping in another way
This is in preparation for step_x support as the default behavior for these procs is necessary for proper functionality.

turf/Enter and atom/movable/Move default code got rewritten to replicate default byond functionality with minor changes.
2018-07-07 11:22:29 -04:00
Trevor Serpas
bee0b5b2c3 Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 02:00:25 -04:00
ShizCalev
ecf60367ab Fixes aurora event runtime (#38787) 2018-06-28 21:43:28 +03:00
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
AnturK
1572321137 Adds make_associative helper. 2018-06-23 22:22:05 +02:00
AnturK
99cdc677b3 Forgot this 2018-06-23 18:06:00 +02:00
AnturK
7b80231d6c Fixes anomaly area selection 2018-06-23 18:04:05 +02:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Tad Hardesty
8834612336 Fix item fortification scrolls stacking (#38551) 2018-06-18 04:02:26 -04:00
Tad Hardesty
05107047dc Merge pull request #38098 from kevinz000/transit_space_refactor
Transit space refactor
2018-06-16 12:40:37 -07:00
ninjanomnom
d483ff3ef0 Regexes
`([^_\.])SendSignal\((.+?)\)` -> `\1SEND_SIGNAL(src, \2)`
`([\.\w]+?)\.SendSignal\((.+?)\)` -> `SEND_SIGNAL(\1, \2)`
2018-06-13 19:19:23 -04:00
XDTM
af50573d85 Virus crates now contain randomly generated viruses instead of single-symptom advance presets (#38412)
* Virus crates now contain randomly generated viruses instead of single-symptom advance presets

* fix

* mapswap
2018-06-13 00:44:19 -07:00
ShizCalev
3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04:00
kevinz000
7bf86ed53f Refactors transit requests to turf_reservations. 2018-06-04 16:30:15 -07:00
Jordan Brown
6d0179f57b Merge pull request #38116 from AutomaticFrenzy/patch/anchored
Refactor machinery to default to being anchored
2018-06-01 12:27:38 -04:00
vuonojenmustaturska
c65a99f130 Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 11:36:31 +02:00
ShizCalev
c41d6ac965 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-30 21:57:06 -07:00
Tad Hardesty
c5443d572f Fix runtimes when pipe placement fails due to overlap (#38104) 2018-05-28 01:48:13 -04:00
Tad Hardesty
2f212e16a3 Remove redundant anchored=TRUE from machines 2018-05-27 19:23:37 -07:00
vuonojenmustaturska
2560ec3988 Adds action features to the metastation beerkeg-nukes (#38084)
* Hottomonkulu Pyynö mos kyren hepität. Nerse marentaat aluturnate.

* Masennoo sum keuron väkeltäät vassem Pyynö er borsalitaat Urmas.

* Tarnatat kuulor ustanitat vernes heuremasso seurutik Pyynör kanervo mahkatosimos. Atti ivakhan nutiv.

* Surmustulet nasnas kyhille nes viuhuntut sepelitör arnisansatin.
2018-05-27 14:20:11 -07:00
Jordan Brown
47ab8f76f2 Merge pull request #37993 from DaxDupont/more-juice
Adds two saferChems for vent clogs.
2018-05-25 11:53:59 -04:00
vuonojenmustaturska
4f210f49f5 Disallow effects from being scanned by the chameleon projector (#38017)
* henk

* iseffect
2018-05-25 14:36:56 +02:00
Dax Dupont
6cab72363e Adds two saferChems for vent clogs. 2018-05-22 18:42:54 +02:00
81Denton
85c87db298 Remove skewium from saferChems (#37925) 2018-05-21 01:56:43 -07:00
pubby
9ca6661140 [ready] cargo bounties (#37833)
* Cargo Bounties

* Rebalance and merge exports into bounties.

* Tweak and add bounties.

* Fix spelling errors + tweak mech prices.

* Last minute bugfix

* Add bounty consoles to maps.

* Naksu changes

* save 500 cycles woooooooooooooooooooooooooo

* One last price tweak

* Nerf addy and alien sheets
2018-05-20 18:44:11 +12:00
ShizCalev
65324864d3 Fixes vent_clog bad chem id runtime (#37887)
* Fixes vent_clog bad chem id runtime

* sodiumchloride
2018-05-17 18:55:58 +03:00
XDTM
aa782fffd2 [s] Hallucinations 4.0 (#37423)
No ingame changelog cause these are supposed to fool people.

Changes:

    Hallucinations now pick from a single weighted list, instead of being separated in tiers. The more obvious a hallucinations, the less likely it is to appear.
    Hallucination is now a contantly ticking down variable. 1 hallucination = 2 seconds duration. Hallucinating effects have been rebalanced to fit this.
    Hallucinations have a random cooldown ranging from 10 to 60 seconds. The status will still tick down in the meantime.
    The Sounds hallucinations has been split in three: realistic sounds (likely), weird sounds (rare), and station messages (i.e. the shuttle arrived, blob warning, etc.)(also rare).
    The Bolts hallucination now stops you from bumping doors open. You can still click them to open them.
    Removed the singulo hallucination. It's pretty much impossible to make it realistic enough, and it's too widely known to scare someone. It's an annoyance and a definite tell that you're hallucinating.
    Removed the xeno attack for the same reasons. It was kept in the code to serve as a pseudotemplate for hallucination mobs.
    Removed the fake attacker hallucination. Trying to replicate full attack and defense code as well as managing icon generation with blacklists and all is just not worth it. It would never be realistic enough.
    RDS hallucinations have been either rolled into normal ones or removed (the OOC ones). No reason to keep them separate, aside from throwing off the hallucination odds (which has resulted in complaints about the cult victory warning being too common).
    Added/edited a lot of strings for the text-based hallucinations. I could definitely use a few more for the message hallucination, i got writer's block there.
2018-05-10 09:15:46 +12:00
vuonojenmustaturska
fd4c753a04 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 (#37597)
* kill BANG_PROTECT_2

* let's put this back in

* dirty

* kill OMNITONGUE_2

This is a write-only variable, probably leftover from some refactor years ago

* kill flags_2
2018-05-02 14:13:41 -04:00
Jordan Brown
9e42524ff5 Merge pull request #37590 from 81Denton/cargo-categories
Reorganizes cargo's big "miscellaneous supplies" category
2018-05-01 16:38:04 -04:00
Denton
17deccd316 cargo categories + crate types 2018-04-30 20:23:10 +02:00
Dax Dupont
841a6aff93 Adds some more reagents to clogged vents 2018-04-29 18:57:10 +02:00