Commit Graph

997 Commits

Author SHA1 Message Date
Jordan Brown
0707c44a55 Merge pull request #40647 from ShizCalev/pirate-ransom
Fixes pirates being able to ransom themselves to CentCom
2018-10-05 18:08:45 +01:00
ShizCalev
50724e7ae3 Fixes immoveable rod move force (#40551) 2018-09-30 12:09:29 +01:00
Ling
f615165de9 Merge pull request #2699 from yogstation13/upstream-merge-40462
[MIRROR] [Ready for review]Adds credit holochips to replace magic cash
2018-09-26 22:55:54 +02:00
Ling
008f5d49f8 Merge pull request #2621 from yogstation13/upstream-merge-40220
[MIRROR] Objective refactor
2018-09-26 18:54:06 +02:00
XDTM
5a4e5b8090 [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-25 23:34:22 +01:00
Iamgoofball
428a033e39 [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 10:45:14 +01:00
AnturK
d7c79d5f81 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 16:18:57 +01:00
Tad Hardesty
4145a8c6e8 Set the default port name for navigation computers (#40277) 2018-09-15 21:57:33 +01:00
81Denton
3a88c237c7 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 10:05:52 +01:00
AnturK
106955e427 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 10:50:25 +01:00
ninjanomnom
0833ebb4ba Handle shuttle registration from inside the template 2018-08-21 15:45:41 +01:00
Patrick Chieppe
584ab92bc3 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 20:40:46 +01:00
Jordan Brown
0b6e1cb6d8 Merge pull request #39481 from AutomaticFrenzy/patch/syntax
Fix some weird syntax
2018-08-04 22:49:35 +02:00
Emmett Gaines
60b20fc22c 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-02 05:19:08 +01:00
bgobandit
43255f34bd Fix more spelling/grammar (#39450)
self explanatory
2018-07-30 00:19:01 +01:00
Jordie
0276c0bddb Merge pull request #39157 from vuonojenmustaturska/plasmadecontamination
Adds an IC way for admins to clear a plasma flood
2018-07-17 17:21:26 +01:00
morrowwolf
bb48b6f124 does what is hopefully the last standards change 2018-07-17 08:36:40 -06:00
morrowwolf
d5540cd9bb makes it actually compliant to standard 2018-07-17 07:05:55 -06:00
morrowwolf
1070e827a3 re-added redundant dumb shit because ling is lame 2018-07-16 18:07:01 -06:00
morrowwolf
b2e00e73e9 does some shit or something iunno 2018-07-16 03:21:12 -06:00
Jordan Brown
9070e16752 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 17:10:07 +01:00
Jordan Brown
495fceea1d Merge pull request #38982 from 81Denton/shuttle-loans
Adds a new shuttle loan event, tweaks others
2018-07-12 22:24:40 +01:00
Jordan Brown
703d9c0943 Merge pull request #38938 from ninjanomnom/b-b-bump
Converts collide back to bump and fixes double bumping in another way
2018-07-09 19:51:07 +01:00
Trevor Serpas
6d395a672f 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 07:01:19 +01:00
Nich
6c879778b6 spellchecks tg whatever 2018-06-28 21:26:38 +02:00
ShizCalev
904f326776 Fixes aurora event runtime (#38787) 2018-06-28 19:43:58 +01:00
Jordan Brown
91478f828d Merge pull request #38683 from AnturK/anomalyfix
Fixes anomaly area selection.
2018-06-25 15:18:02 +01:00
Tad Hardesty
bf1597cc70 Fix item fortification scrolls stacking (#38551) 2018-06-18 10:03:34 +01:00
Tad Hardesty
6332cabfe8 Merge pull request #38098 from kevinz000/transit_space_refactor
Transit space refactor
2018-06-16 20:41:21 +01:00
Nich
ee523d7548 Merge pull request #1285 from yogstation13/upstream-merge-38287
[MIRROR] Signal define
2018-06-15 20:42:54 +02:00
Nich
06dcd687cd Revert "Revert "[MIRROR] Virus crates now contain randomly generated viruses instead of single-symptom advance presets"" 2018-06-15 15:27:09 +02:00
Tad Hardesty
10e0fa2560 Merge pull request #38287 from ninjanomnom/signal-define
Use a define to speed up sending signals to datums with no signals
2018-06-15 12:40:41 +01:00
Ling
bfeae54d63 Revert "[MIRROR] Virus crates now contain randomly generated viruses instead of single-symptom advance presets" 2018-06-13 12:35:06 +02:00
XDTM
f65a95d6a8 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 08:45:05 +01:00
oranges
424a65b3e6 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-12 00:49:00 +01:00
Nich
4306fa6b4a fixes ion thingies 2018-06-03 19:17:25 +02:00
Jordan Brown
f9e709c18c Merge pull request #38116 from AutomaticFrenzy/patch/anchored
Refactor machinery to default to being anchored
2018-06-01 17:28:09 +01:00
vuonojenmustaturska
77410bd84b 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 15:48:10 +02:00
ShizCalev
39c247d6a9 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-31 05:57:29 +01:00
Nich
37950ea693 Merge pull request #1038 from yogstation13/upstream-merge-38104
[MIRROR] Fix runtimes when vent wrenching fails due to overlap
2018-05-28 17:13:37 +02:00
Tad Hardesty
97bdd4c35d Fix runtimes when pipe placement fails due to overlap (#38104) 2018-05-28 06:48:30 +01:00
vuonojenmustaturska
deede83748 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 22:20:21 +01:00
Jordan Brown
6f66a66e8c Merge pull request #37993 from DaxDupont/more-juice
Adds two saferChems for vent clogs.
2018-05-25 16:54:03 +01:00
vuonojenmustaturska
b64e216613 Disallow effects from being scanned by the chameleon projector (#38017)
* henk

* iseffect
2018-05-25 13:37:12 +01:00
pubby
6e145a6ff9 [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-22 18:06:46 +02:00
81Denton
075aadd39a Remove skewium from saferChems (#37925) 2018-05-21 11:35:48 +01:00
Ling
8a13806470 Merge pull request #872 from yogstation13/nichlas0010-patch-1
Update magicarp.dm
2018-05-18 00:06:32 +02:00
Nich
549ac093e8 Update magicarp.dm 2018-05-17 23:37:21 +02:00
ShizCalev
bc7fa8413c Fixes vent_clog bad chem id runtime (#37887)
* Fixes vent_clog bad chem id runtime

* sodiumchloride
2018-05-17 18:54:18 +01:00
Nich
9e697a204b Update meteor_wave.dm 2018-05-11 12:25:32 +02:00