Commit Graph

5489 Commits

Author SHA1 Message Date
skoglol
cf247d0e9c Merge pull request #49820 from Timberpoes/geneupdates
Allow DNA Consoles to show compatible chromosomes for activated mutations
2020-03-14 02:10:05 +01:00
wesoda25
a34e81d426 Adds a couple mood events (#49918)
* bang!

* Dr. Joseph-Ignace *********
2020-03-14 01:58:18 +01:00
Bawhoppen
7f73fd2a7b Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
2020-03-12 05:06:09 -05:00
kevinz000
052c50aef1 wack 2020-03-11 22:54:56 -07:00
kevinz000
48bc3fdd64 Merge branch 'master' into movespeed_modifiers_take_two 2020-03-11 17:19:27 -07:00
SteelSlayer
d4005b2170 Label component code fixes (#49855)
* Label component additions that should have been included

updates comments

forget this

* fix spelling mistake

* I suck at spelling

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-03-11 15:30:17 +08:00
Fikou
cb923d982d plastic is now a rigid material (#49838) 2020-03-10 18:35:44 +08:00
XDTM
fe402c2699 fixes regen coma (#49834) 2020-03-10 16:47:26 +08:00
kevinz000
2c25b2cdfd Merge branch 'master' into movespeed_modifiers_take_two 2020-03-10 00:59:01 -07:00
spookydonut
beca456c0f Add new lints (#49751)
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-03-09 22:13:48 -07:00
EdgeLordExe
ff88807696 MMh yes i know this type of stone: Mining skill QOL (#49746)
* yeah

* kekw
2020-03-09 19:06:02 -07:00
EgorDinamit
cb6be8bd68 Merge branch 'master' of git://github.com/tgstation/tgstation 2020-03-09 12:35:20 +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
EgorDinamit
f83bbf662e Merge pull request #8 from tgstation/master
Fixing merge problems
2020-03-08 20:54:46 +04:00
Timberpoes
276c20cd98 Modifications to allow DNA Consoles to show compatible chromosomes for activated mutations 2020-03-08 13:23:31 +00:00
ArcaneDefence
7f4c49fce2 Removes pacifist cqc neck grab bug (#49776)
Adds a check for pacifism before upgrading to a neck grab via chokehold combo.
2020-03-08 20:20:04 +08:00
EgorDinamit
7e8115e878 Merge branch 'master' into master 2020-03-08 15:08:50 +04:00
ShizCalev
c3ebb6f135 Merge pull request #49747 from tralezab/patch-84
caltrops damage you after they send a visible message
2020-03-06 21:44:11 -05:00
ShizCalev
4c846ff6e2 Merge pull request #49742 from nightred/offhand-issue
Off hand item drop fix
2020-03-06 17:41:16 -05:00
tralezab
43ec902cd1 fixes unremovable mutations, fixes weird tail organ shennanigans (#49771)
* THE mutations fix

* removes !owner

* removes redundant code (yay)
2020-03-06 23:39:50 +01:00
nightred
baf9ef3e19 one more useless check removed 2020-03-06 09:49:50 -06:00
nightred
695fec66c2 remove some TK checks that are dead 2020-03-06 09:47:53 -06:00
IndieanaJones
0ec9805760 Update saymode.dm 2020-03-06 01:34:33 -05: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
Bawhoppen
7bb27cf55e getting closer to being ready 2020-03-05 18:09:21 -06:00
tralezab
211f219995 woop 2020-03-05 15:03:00 -08:00
tralezab
a7259a7d7a words before damage 2020-03-05 15:01:26 -08:00
nightred
e2f03055a9 oh lets not make a loop that was bad 2020-03-05 12:25:38 -06:00
nightred
944fe34d80 telekinesis checks for held object 2020-03-05 12:22:55 -06:00
Emmett Gaines
718074ce55 Build SpacemanDMM from source (#49712)
* Build SpacemanDMM from source

* oops

* Fix new unreachables/dumb code

* ooops cache conflict

* bugfix

* oops

* lint

* ninjanomnom held me down and forced me to delete this
2020-03-05 11:54:04 -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
nightred
5f0cf09967 Off hand item drop fix 2020-03-05 08:56:06 -06:00
spookydonut
50058b9a1f Adds the label component; Small tweaks to the hand labeler (#49700)
* Adds the label component

* switches to using RegisterWithParent / UnregisterFromParent

* Adds docs. Change Destroy() to qdel(src)
2020-03-05 21:33:29 +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
spookydonut
49eab491b4 Gamer skill (#49618)
* gaming.dm added

* initial changes

* gamer god trait

* finalization after testing

* spellcheck + flavortext

* phone gamer support

* incorporates review suggestions

* tiny flavor change in pwr game desc

* more trait-related touchups and minor fluff

* adds and removes ?s where needed

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-05 20:06:33 +08:00
Bawhoppen
1f82ec544e Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-03-04 20:02:26 -06: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
tralezab
be1291c232 fixies! (#49534) 2020-03-03 18:18:16 +08:00
Bawhoppen
d0c5d63116 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-03-02 19:30:48 -06:00
necromanceranne
746fb273d1 autodocs hurt my simple catbrain 2020-03-03 05:57:21 +11:00
necromanceranne
1b8b80b0a8 gonna be on the safe side with that brute mod after all 2020-03-03 05:27:15 +11:00
necromanceranne
1ca314feee someone convinced me to keep deflection for now. 2020-03-02 16:49:01 +11:00
necromanceranne
916f04440b oh god I hope mr. orange man isn't angy 2020-03-02 15:58:12 +11:00
necromanceranne
0425bc2c9e oh wait they do stack nutso 2020-03-02 13:57:33 +11:00
necromanceranne
bf2ab26d2e I think the fishmen are no longer pillermen 2020-03-02 13:47:47 +11:00
skoglol
24de591c87 Merge pull request #49636 from Ryll-Ryll/let-there-be-tape
Puts basic sticky tape in autolathe, makes pointy and super sticky tape the BEPIS major reward
2020-03-01 15:22:35 +01:00
kevinz000
350b9b7a29 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-03-01 06:50:37 -07:00
Bawhoppen
527ab502a3 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
2020-03-01 03:30:17 -06:00