Commit Graph

1432 Commits

Author SHA1 Message Date
yogstation13-bot
d76347d768 [MIRROR] fixes grammar error in void magnet (#5016)
* Fix grammar error in void magnet (#43426)
2019-04-02 14:02:32 -05:00
ShizCalev
fa4ce61979 Merge pull request #43215 from AutomaticFrenzy/patch/throw-exception
Replace 'throw EXCEPTION' with CRASH or WARNING
2019-03-23 12:16:22 +01:00
Tad Hardesty
d8fadc07ef Add some additional type annotations to lists (#43087) 2019-03-17 14:23:09 +01:00
4dplanner
bc1651e763 legion cores remove CC instead of adminhealing [READY] (#42378)
* legion cores remove CC

* legion -> regenerative

* lore

* Icons

fixes last reference to legion core in status

* Automatic creation of classes is possibly the worst feature of all time

* Moves remove_CC

* Review changes
2019-03-14 12:20:48 +01:00
yogstation13-bot
1023d30626 [MIRROR] Fixes regenerative core only working below CRIT_THRESHOLD instead of at it. (#4736)
* Fix regenerative core only working below CRIT_THRESHOLD instead of at it (#43062)
2019-03-09 19:05:51 -06:00
ShizCalev
b8de7dbb9f Merge pull request #43036 from BuffEngineering/sip-fix
Fixes non-shameful, nonlethal suicides
2019-03-08 12:37:37 +01:00
yogstation13-bot
d39cc864c5 [MIRROR] Loot crates no longer explode after unlocking (#4631)
* Loot crates no longer explode after unlocking (#42957)

* loot crates no longer explode after unlocking

* Adds a comment

* Loot crates no longer explode after unlocking
2019-03-01 15:01:26 -05:00
yogstation13-bot
d24864fb35 [MIRROR] Standardises hierophant cardinal damage (#4564)
* Merge pull request #42854 from 4dplanner/hiero

Standardises hierophant cardinal damage

* Standardises hierophant cardinal damage
2019-02-25 18:18:13 -05:00
kevinz000
5b236debd0 Fixes projectiles not hitting people resting, a bit of refactoring of how projectile target collision is done (#42241)
* Fixes projectiles not hitting mobs, some refactoring too

* some stuff for projectile can hit target to work with not being ontop of an object

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* CanPass returns true to projectiles regardless of hit

* snakecase?
2019-02-01 11:29:48 +01:00
ShizCalev
b16e61950a Cyborg modules now automatically turn off when deactivated (#41326)
* Cyborg modules turn off when deactivated

* gives mining borgs built in mining scanners
2019-01-23 22:53:03 +01:00
coiax
66df5546ee Refactors NODROP flag into TRAIT_NODROP (#42109)
* Refactors NODROP flag into TRAIT_NODROP

🆑 coiax
fix: Anti-drop implants can no longer be used to drop objects that they
were not responsible for sticking to a person's hand.
fix: Backfiring with a Barnyard spellbook will now play a spooky horse sound.
refactor: Refactors the way that "NODROP" items work to a new system,
there should be no change in functionality.
/🆑

Various items in the codebase were doing weird hoop jumps in order to
preserve the nodrop flag's state when it also wanted to change it, so I
moved it to a trait system.

I may have gone overboard with the type of unique trait sources, but
those can be changed later. My long term plan is make a general "CURSED"
nodrop origin, which means you can unlock cursed items by being hit with
a bolt of door opening or something. But that's for another PR, this has
no functionality changes, apart from some slightly modified descriptions
on cursed masks.

- Removed a bunch of redundant voice changing code for all the voice
changing animal masks, used two new clothing flags for this purpose.
- Also refactored a bit the animal masks, making new cursed subtypes that play
the sound when created.

* Drop location
2019-01-17 21:22:38 +01:00
Tad Hardesty
56e38b6757 Scope various unscoped locate() calls (#42195)
* Scope locate calls which are immediately checked against a list

* Remove silly use of locate from bible Topic

* Scope various locate calls (needs testing)

* More WIP

* Buff up lightswitches while we're here

* Tidy record browsing code

* Scope a few more locates

These have caused problems in the past (#41917, #39303). Continues #29349.

Also cleans up lightswitch code while I was already touching it.

I recommend a testmerge.
2019-01-06 08:37:39 +01:00
nichlas0010
030545fa4d Merge pull request #4039 from yogstation13/upstream-merge-42074
[MIRROR] Blood contract knives only last two minutes, like the chainsaw
2019-01-04 00:51:38 +00:00
oranges
7f2cb2f4bb Merge pull request #42182 from coiax/fixes-void-popping
Fixes mobs being left in inconsistent state with the Void mutation
2019-01-04 01:13:02 +01:00
coiax
6dfab2bd6a Blood contract knives only last two minutes, like the chainsaw (#42074)
* Added admin smite: Mark for Death

🆑 coiax
admin: Admins can Mark For Death with the Smite menu, which functions
the same as someone being blood contracted.
tweak: The butcher knives and the red colouring of someone
marked for death will disappear after two minutes.
/🆑

The primary use I see of Mark for Death? WGW readers. Saw some
other admins use it, but they had to manually spawn in a contract
and use it.

The cleaning up after two minutes is so the station isn't covered in
cleavers, and the RED GET THIS GUY fades, so people can be horrified/thrilled
at their actions appropriately.

* No more smite for death

* Also remove that line

* Only the knives
2019-01-03 17:37:04 +01:00
81Denton
9c17b4a374 Improves saw cleaver desc (#42112) 2018-12-30 04:51:32 +01:00
oranges
cb2f686639 Merge pull request #41940 from MMMiracles/investingoldandsilver
Adjusts coin prices
2018-12-16 13:22:43 +01:00
moo
03813fc8e7 Watcher's Wing No Longer Perma-Disarms (#41708) 2018-11-30 07:17:05 +01:00
coiax
12f26e0815 Renames "Weight Machine" to "weight machine" (#41678)
Improperly named things annoy me.
2018-11-29 13:56:18 +01:00
Jordan Brown
e9151c462d Merge pull request #41662 from kriskog/markers
Adds light eater interaction to marker beacons
2018-11-24 20:21:19 +01:00
Jordan Brown
5a7079df7b Merge pull request #41602 from swindly/word_crimes
Fixes more word crimes
2018-11-21 15:42:41 +01:00
subject217
340b1eabff Moves damage deflection code from doors to machines and gives it to the stacking machine (#41551)
* moves damage deflection from doors to machines and sets the stacking machine's at 21

* return

* NONE
2018-11-20 11:12:54 +01:00
Ling
421701d12d Merge pull request #3550 from Ktlwjec/med_scanner
Fixes some text when using medical scanners to check viruses
2018-11-17 13:37:31 +01:00
Ktlwjec
83e16e3bd7 updates virus text for medical scanners 2018-11-16 20:24:29 +00:00
4dplanner
8d1be69d22 Passes thrownthing to hitby (#41411)
* Passes thrownthing to hitby

* Items now also pass thrownthing

* No longer uses default arguments

Also fixes bananium shield

* Adds more arguments to hitby calls

* Standardises throw_impact

* Clears up some loose ends

* Adds back wacky comment

* Reinstates can_push=FALSE on bananium shield
2018-11-15 14:30:27 +01:00
ShizCalev
29784e986d Fixes illiterate & blind mobs being able to read books (#41400)
cl ShizCalev
fix: Fixed inconsistency where illiterate and blind mobs were able to read some books/manuals, but not others.
fix: Fixed mobs being granted mime speak even if they failed to finish reading the Guide to Advanced Mimery Volumes 1/2.
/cl

Step towards resolving #41396
2018-11-12 16:53:57 +01:00
81Denton
5b9d4df04a [Ready] Machinery shows part upgrade stats (#40920)
cl Denton
tweak: Most upgradeable machines now show their upgrade status when examined while standing right next to them.
tweak: Added examine messages to teleporter stations that hint at their multitool/wirecutter interactions.
tweak: Renamed teleporter stations from station to teleporter station.
code: Changed the teleporter hub accurate var to accuracy; the old name misled people into thinking that it was a boolean.
/cl

Machines don't really give players feedback about upgrades, aside from machines like the cloner where new functions are unlocked. I'm adding examine descriptions that should help with this:
2018-11-05 17:48:09 +01:00
Jordan Brown
e654e5104f Merge pull request #41231 from ShizCalev/capsaicin-cleanup
Cleans up eye/mouth protection checks
2018-11-02 19:22:28 +01:00
Jordan Brown
0b51d7be1b Merge pull request #41162 from ShizCalev/gulag-point
Fixes manually inserting sheets into a gulag stacker not adding points
2018-10-27 17:41:45 +01:00
Ling
2f20b7a434 Merge pull request #3143 from ThatLing/fuck-ing-kill-me
Fixes mirrors
2018-10-20 12:54:09 +02:00
Qustinnus
26f18c9660 Legion core / aheal now only removes temp moodies. also bad moodie for using it (#40657)
cl Floyd / Qustinnus
fix: Legion core / aheal now only removes temp moodies
add: Legion cores now give you a bad moodlet
/cl

#40110

fixes
2018-10-20 11:58:48 +02:00
ShizCalev
bc60cab6c5 Fix being unable to stuff money into IDs (#41006) 2018-10-20 06:17:12 +01:00
Ling
ab0dd01a09 Merge pull request #2967 from yogstation13/upstream-merge-39967
[MIRROR] Combat/Stun (slip) overhaul staging, mobility flags, adds crawling
2018-10-11 19:54:55 +02:00
ShizCalev
4913e49837 Correct blue space to bluespace (#40746) 2018-10-11 17:22:27 +02:00
kevinz000
1f7a76ade0 Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)
Aiming to implement the framework oranges has detailed in https://tgstation13.org/phpBB/viewtopic.php?f=10&t=19102
Moves canmove to a bitflag in a new variable called mobility_flags, that will allow finer grain control of what someone can do codewise, for example, letting them move but not stand up, or stand up but not move.

Adds Immobilize()d status effect that freezes movement but does not prevent anything else.
Adds Paralyze()d which is oldstun "You can't do anything at all and knock down).
Stun() will now prevent any item/UI usage and movement (which is similar to before).
Knockdown() will now only knockdown without preventing item usage/movement.
People knocked down will be able to crawl at softcrit-speeds
Refactors some /mob variables and procs to /mob/living.
update_canmove() refactored to update_mobility() and will handle mobility_flags instead of the removed canmove

cl
rscadd: Crawling is now possible if you are down but not stunned. Obviously, you will be slower.
/cl
Refactors are done. I'd rather get this merged faster than try to fine tune stuff like slips. The most obvious gameplay effect this pr has will be crawling, and I believe I made tiny tweaks but I can't find it Anything I missed or weird behavior should be reported.
2018-10-10 23:21:27 +01:00
kevinz000
bcf88a2064 Techwebs Backend Refactor - Removes references from techwebs and uses IDs instead (#40596)
Yeah yeah I know no opening too many WIP PRs but this one's [ready] and I want to make sure any furthur techweb development doesn't keep using the old reference system which will make refactoring it harder, and this makes it easier for coders to do stuff in theory (at least for me), standardizes getting a node/design, and makes stuff actually GC properly.
2018-10-05 19:51:10 +01:00
Ling
b93a83e829 Merge pull request #2776 from yogstation13/upstream-merge-40474
[MIRROR] Standardizes bomb logging
2018-10-01 11:08:36 +02:00
Ling
b39c4c7868 Merge pull request #2767 from yogstation13/upstream-merge-40414
[MIRROR] Replaces istypes with the proper tool_behaviour checks.
2018-10-01 11:02:19 +02:00
Ling
6fe122312a Merge pull request #2729 from yogstation13/upstream-merge-40529
[MIRROR] Cleans up some log_message stacktraces
2018-10-01 10:30:14 +02:00
ShizCalev
949c1f89df Standardizes bomb logging (#40474)
Fixes #39976

A good number of things were missing various parts of the logging (going to GLOB.bombers, not going to client logs, not logging to game, ect), or doing incorrect things like passing admin verbs to saved logs.

Unified all the necessary actions under a single proc log_bomber() which handles everything in most use cases. This way the log isn't all jumbled up with inconsistent messages, everything's one format so you can quickly find what you need to bwoink the right person.
2018-10-01 09:17:12 +01:00
ShizCalev
5a29dc43e3 Replaces istypes with the proper tool_behaviour checks. (#40414) 2018-10-01 01:10:45 +01:00
Jordan Brown
55afcbdb64 Merge pull request #40529 from ShizCalev/log-message-stacktrace
Cleans up some log_message stacktraces
2018-09-28 00:03:03 +01:00
Poojawa
9fd43da1af [s] Fixes ore redemption exploit (#40454)
* Fixes bluespace crystal memes

* Generalizes refined type check

* generalizes here as well

* Now now, no need to be lazy.

* removes duplicate istype check
2018-09-27 14:04:12 +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
0598f567c9 Merge pull request #2708 from yogstation13/upstream-merge-40490
[MIRROR] Removes superfluous sacid beakers
2018-09-26 22:41:15 +02:00
Ling
4fd1b2e0c4 Merge pull request #2681 from yogstation13/upstream-merge-40433
[MIRROR] Componentizes orbiting
2018-09-26 18:54:58 +02:00
Ling
008f5d49f8 Merge pull request #2621 from yogstation13/upstream-merge-40220
[MIRROR] Objective refactor
2018-09-26 18:54:06 +02:00
81Denton
992e9fe64f Removes superfluous sacid beakers (#40490) 2018-09-26 10:30:19 +01: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
ShizCalev
a08866036b Fix adjustHealth runtimes (#40453) 2018-09-25 09:08:21 +01:00