Commit Graph

8403 Commits

Author SHA1 Message Date
Unit2E 2a239de7cf fixes toy dualsabers gaining damage (#49789)
* clean fix for toy problem

* did code suggestions
2020-03-10 17:16:10 -04:00
ShizCalev 79c98aee63 Merge pull request #49830 from Bokkiewokkie/It's-spriting-time-again
Adds tons of sheet inhands and makes them be obstructed by your body when facing north.
2020-03-10 01:16:03 -04:00
Iamgoofball 3203f19290 The Families Gamemode. Home. At least it was 'til I fucked everything up. (#49274)
Adds the Families gamemode to the codebase. In this 1 hour showdown, 
multiple criminal families are placed onto the station with their goal 
to rack up the most points by the end of 1 hour. At which point, the 
Space Cops hit up the station to crack down on the family activity. The 
severity of the Space Cops is based on how much carnage and murder the 
families have committed.

## Why It's Good For The Game

With an actual official medium/heavy RP server, and the codebase taking 
a much harder swing towards heavier consequences for death, a more 
player focused gamemode with a unique swing on teamwork, the concept of 
what exactly is an antagonist, and trust/paranoia will do wonders to 
help improve that atmosphere.

Previous tests went extremely well(when administrators weren't 
intentionally sabotaging it by welderbombing families as the Head of 
Security every single round immediately with no escalation), but 
suffered from "this just isn't a gamemode for no RP servers like /tg/".

However, /tg/ is now an RP server.

Get ready to rep your family.

## Isn't this just Gang?
Heck no. Only thing similar is tagging turf and the fact criminal 
groups are involved. This mode is completely different otherwise.

## Heck yeah, where do I sign up?
Ask a family member where their Signup Point is, and then simply click 
on it with an open hand. You'll be signed up for the family instantly, 
and given some sick threads and a spraycan for tagging.

## How do I rep my family?
Wear your gang's uniform or colors similar.

## What does it mean to roll with a crew?
Travel in a group of four or more for bonus points towards your gang.
However, you receive less for having eight or more, so be careful. Try 
to spread your crews out!

## I'm an X, what do?
Gangster: Yeah, go do whatever. Wanna backstab your gang? Go for it. 
You can switch sides at any time by clicking on an enemy gang's sign up 
point. Wanna murder some snitch because they ratted you out to the 
pigs? Do it. Wanna pressure the locals into supplying you with goods to 
export? Emergent gameplay.
Civilians: Wanna join a gang? Go for it. Gangsters probably shouldn't 
be arbitrarily murdering you, but if you're repping someone else's 
colors, don't expect to be given a free pass. After all, uniforms are 
the only way to really identify a gang member.
SPACE COP: Get rid of all the gangsters. Secure the station. Protect 
the law. Uphold the law. Eat donuts.

## No huds? How can I tell if someone's part of my group?
Tough shit, man. I hope you like trust.

In short, this gamemode will be a fun exercise in how far the 
playerbase can go in regards to trusting eachother and unifying to meet 
a common goal for their group with no rules, gameplay mechanics, or 
anything actively forcing them to work together.

## How do I know if someone is a gangster?
1. Are they wearing a gang uniform/color?
   If yes, they're probably a gangster.
   If no, they're probably a civvie.
2. Are they attacking gangsters?
   If yes, they're probably a gangster.
   If no, they're probably a civvie.
2020-03-08 18:33:54 -07:00
Dennok 8a888c690c Fix on station jet air using and trails only on use. (#49567)
* Update carbon_movement.dm

* Carbon use jets before basic spacemove sources

Now carbons dont try propel yourself by thing around, when use jet.

* up

* Jet used when jet must be used

No more persistent jet air use

* Jet implant used when jet implant must be used

No more persistent jet implant air use

* TRUE and FALSE in carbon_movement.dm

* missing right-paren

* missing right-paren in imp

* better jetpack check

* better augment jetpack check

* augment jet toggle on fix

* fix m

* up

* Jet trails only on air use
2020-03-08 20:35:10 -04:00
Bokkie 69501ce8cb Smol fixes
Fixed some minor alignment/ orientation issues on the inhands of various sheets and adds a bit of missing code to the bronze tilesheets because it's parent is a tile instead of a sheet.
2020-03-09 01:15:24 +01:00
Bokkie 9d8eec7763 Second sheet inhand collection
added Plasteel, Plasma, Adamantine, Runite, Mythril, Alien alloy (shameless copy of the tile sprite) and Bamboo. Also changed all sheet sprites to be obstructed when your body is in front of it while you're facing north.
2020-03-09 01:15:24 +01:00
moo 88e06cfc7d Removes the Double Baton 'Tech' / Fixes targeting issues related to the stunbaton (#49774)
* double stun is a no!

* moved before it deducts charge

* fixes an issue with zone selection in batons
2020-03-08 20:34:26 +08:00
ShizCalev f7ca6fc7da Merge pull request #49737 from Dennok/patch-4
Hand Tele try place portal ahead of user.
2020-03-06 21:52:47 -05:00
ShizCalev 03a887530a Merge pull request #49738 from Arkatos1/lasertweaks
Radioactive Microlaser UI tweaks
2020-03-06 21:44:38 -05:00
ArcaneDefence 827543aff8 Adds mothperson plushie (#49732)
* Adds moth plushie

Creates and adds a mothperson plushie to the arcade loot table.

* Adds a return I didn't notice I deleted

'cause I don't need to remove things if I don't intend to.
2020-03-06 14:13:56 +08:00
Ryll Ryll f9963454db Adds tackling (VIDEO INSIDE) (#49476)
* huthtuthuthuthtuhtuthuthuthuthtuthuthuthtuthut

* documents and expands, adds new glove types

* Adds slamming into tables and neatens up throwingdatum handling (+stuff)

* bit less squishy

* adds sprites, offbrands, swaps most combat insuls for tacklers

* adds dolphin and rocket gloves to BEPIS

* changes dna to traits, buffs tackling

* same as last commit but moreso

* updates docs, nerfs stuns

* vending machines, better docs

* window tackles for good measure

* gets window splats working

* polish off

* LAST DAY OF SCHOOL
2020-03-06 11:17:52 +08:00
moo 72b7a266b3 Adds Religious Sects and Basic Technophile Sect for Proof of Concept (#49434)
* このコミットの中が未来です

* Adds Rites

* 💻

* remove bible global

* last minute code changes 😏

* review brah

* waaa_fb

* 

Review stuff, Doc stuff, You can now coax a user to the platform for !!FUN!!

* Update code/modules/religion/religion_sects.dm

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-06 11:11:52 +08:00
ShizCalev be18a622ca Merge pull request #49717 from Qustinnus/lmaowoopsie
you can actually make the hygienebot now
2020-03-05 15:48:33 -05:00
Emmett Gaines d0870a95ac Makes Crossed and Moved should call parent (#49671) 2020-03-05 10:25:24 -05:00
Emmett Gaines 33458640dc Add lints for "new" override prevention feature (#49672)
* Add lints for "new" override prevention feature

* bEsPoKe

* i'm an idiot

* arg index
2020-03-05 10:22:19 -05:00
Emmett Gaines 5622112514 makes setDir shouldcallparent (#49692) 2020-03-05 10:20:35 -05:00
spookydonut 106b4ba672 book console fix (#49696)
* book console fix

* proper console for randomruins
2020-03-05 21:38:40 +08:00
spookydonut a003e376ef Brooms Upgraded: Disposal Bin Edition (#49433)
* clean sensation

* speedmerge hack

* mso.webm

* Update code/game/objects/items/twohanded.dm

Co-Authored-By: nemvar <47324920+nemvar@users.noreply.github.com>

Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-05 20:57:20 +08:00
spookydonut 29fe3a0b76 a couple more genetics perks: martyrdom and HARS, locks chem spike behind crafting only (#49062)
* getting somewhere

* cleanup one

* cleanup two

* supermatter immunity > HADS

* more fluff

* proper return, compile

* lint

* lint 2 electric boogaloo

* cobby happy

* HADS

* some more changes

* i don't know why this file went rogue

* final fixes, small name change, difficulty up (polish!)

* skog help

* EUREKAAAAAAAAAAAAAAAAAAA

* chelp

* reverts some regenerate limbs changes as they are no longer needed, fully integrates attach limb power

* minor fuck before the big fuck

* the big fuck ALMOST DONE, FINISHING TOUCHES NEEDED

* the big fuck finale

* teenie fuck ;)

* line endings

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-05 20:49:24 +08:00
Arkatos 995ccd9510 Rad laser UI tweaks 2020-03-05 13:32:56 +01:00
spookydonut b95543d242 Map fixes, and 1-2 QOL improvements. (#49690) 2020-03-05 19:42:52 +08:00
Dennok d29fcdbe2b Hand Tele try place portal ahead of user. 2020-03-05 13:21:47 +02:00
spookydonut 319ca52545 removing unnecesary double parent proc calls (#49694)
* removing unnecesary double parent proc calls

* i made an oopsie
2020-03-05 18:51:37 +08:00
Unknown 7a671a45cf 😏 2020-03-04 19:57:18 +01:00
AnturK 6735128e96 Fixes coal stack icons. 2020-03-04 19:02:42 +01:00
Qustinnus b70e5c360c Adds a license press for in perma brig (#49452)
* temp

* adds cargo stuff

* dots

* woops

* Update code/game/machinery/prisonlabor.dm

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

* fixes

* Update code/game/machinery/prisonlabor.dm

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-03-04 23:19:21 +08:00
Qustinnus 4b2a8aebe5 [READY] Meat material & material datum turf support (#49402)
* temp

* meatwalls

* more

* adds sheetifier

* fix

* two

* mat texture + 4dplanner admin (#21)

* mat texture + 4dplanner admin

* keep together trait

* counter instead of trait

* finalizations

* woops

* fixes

* oopsie

* only set starting keep_together if necessary (#24)

* keep together as trait again

* remove false comment

* doc for TRAIT_KEEP_TOGETHER

* remove needless scoping

Co-authored-by: 4dplanner <3combined@gmail.com>
2020-03-04 23:18:08 +08:00
nightred 15452cac44 [READY] Two Handed Component (#49422)
About The Pull Request

For an item to be two handed just add this handy component.

All existing two handed items have been converted to use this component.
Why It's Good For The Game

It has components and signals, and now you can make items two handed so simply.

/obj/item/shockpaddles/ComponentInitialize()
	. = ..()
	AddComponent(/datum/component/two_handed)
2020-03-04 11:26:01 +13:00
skoglol 69745adfad Merge pull request #49628 from Mickyan/broom_inv_fix
Fixes brooms messing with inventory
2020-03-01 15:21:28 +01:00
skoglol 50e373d597 Merge pull request #49640 from Mickyan/gum_size
Makes gum boxes tiny items
2020-03-01 15:17:58 +01:00
skoglol 2f1ebf83e5 Merge pull request #49524 from necromanceranne/let-sleeping-carp-lie
Sleeping Carp: Scaled Skin Edition
2020-03-01 01:07:33 +01:00
skoglol cc7391ee3b Merge pull request #49613 from SteelSlayer/airlock-painter-improvements
Airlock painter code improvements. Fixes some mixed up in-hand sprites for it
2020-02-29 22:50:59 +01:00
Mickyan 4cc8832299 gumbox size 2020-02-29 14:46:01 +01:00
Mickyan c0be6d966a broom fix 2020-02-29 02:13:54 +01:00
ShizCalev 9054a4c201 Merge pull request #49596 from ArcaneDefence/Carp_classic_fix
Carp classic carpotoxin fix
2020-02-27 23:36:58 -05:00
ArcaneDefence 84b1dff5e0 Update cigs_lighters.dm 2020-02-27 15:52:05 -07:00
SteelSlayer 5ee0cf0f32 airlock painter 2020-02-27 15:17:06 -06:00
TWATICUS 8facec32c9 bola time 2020-02-27 09:48:25 -05:00
ArcaneDefence edf74e5c05 Update cigs_lighters.dm
Fix for https://github.com/tgstation/tgstation/issues/49588
2020-02-26 17:45:16 -07:00
skoglol 2220049fc2 Fixes blindfolds not properly counting as being blind (#49541)
* Fixes blindfolds not properly counting as being blind

* Call the proper proc
2020-02-25 19:15:33 +01:00
necromanceranne 24f087c9cf Merge branch 'master' into let-sleeping-carp-lie 2020-02-26 02:55:05 +11:00
ArcaneMusic 59ff677b9d Initial Commit. (#49484) 2020-02-25 16:34:30 +01:00
ArcaneMusic 94f27c7b25 [READY]Arconomy: Sales Taggers, split profits on barcoded, sold items! (#49111)
* Startwork

* "Arcane: Everything works up until the export datum bullshit"

* I got up to "Split Profit" in "sell object"

* This is when I switched over to components and it STILL doesn't work

* alright stopwork for the 'night'

* So this is the version that crashes

* One step further in my descent to madness.

* Alright, this should be working (Minus maybe profit_split)

* Alright splitting up custom sales splits is broken right now.

* Profit split works now.

* Alright what the hell is going on here.

* Revert "Alright what the hell is going on here."

This reverts commit 6cb3b6eb56ea45ede3496bbe219ca18302c806e2.

* Oh wait, I can do commit messages through VSC?

* Adds a quick little box with all the shipping supplies you'll ever want, unwrapping signal

* Added shipping box to all maps and the service/cargo lathes.

* Fuck you mapmerge hook you ain't shit

* Alright, yet another take of making it get rid of the pricetag

* [3:43 PM] oranges: anturk is smart (This is true)

* Tested, cleaned up component procs,  and limits signals sent a bit.

* Whoops

* Other comments from Ninja over discord

* Left in a comment line.

* Fixes the issue with ind. barcodes, adds examine.

* Well thank GOD the children wern't there to see it

* Adds a do_after to prevent accidents.

* Fixes merge conflicts

* Fixes merge conflict. Twice in one day.

* Fixes merge conflict.

* one tiny bit of documentation

* Travis play nice.
2020-02-25 20:42:01 +08:00
necromanceranne a3a8a91cc8 I tested block in a few spares and it was too easy to just sit behind it and tank if they had a baton 2020-02-24 22:32:30 +11:00
spookydonut 1a9ddbee5f Merge pull request #48959 from Ryll-Ryll/embeddead
Refactors embedding, adds harmless embeds, sticky tape, admin buttons to make everything embeddable
2020-02-24 15:43:36 +08:00
ShizCalev 0228bc2fbe Call the proper proc 2020-02-24 01:31:38 -05:00
ShizCalev df81c5be4a Fixes blindfolds not properly counting as being blind 2020-02-24 01:10:34 -05:00
Ryll-Ryll 6d379bf62b fixes a few bugs 2020-02-24 01:09:36 -05:00
necromanceranne 044f065a68 bullet swatting 2020-02-24 12:23:10 +11:00
necromanceranne dc3a5b33cb Some additional adjustments 2020-02-23 22:50:50 +11:00