Commit Graph

30699 Commits

Author SHA1 Message Date
skoglol a032d7ef40 Merge pull request #49847 from Mickyan/wig_mimicry
Allows wigs to copy hair styles
2020-03-13 18:27:11 +01:00
skoglol 1a916e6d86 Merge pull request #49908 from TetraK1/shuttleinfo
Improve shuttle calling checking order
2020-03-13 18:25:23 +01:00
skoglol 554301a22a Merge pull request #49906 from ShizCalev/ied-fix
Fixes spawned IEDs not having cans
2020-03-13 18:03:38 +01:00
skoglol 88ab76ab30 Merge pull request #49905 from ShizCalev/beatcop-fix
Fixes undercover cop sunglasses not having flash protection
2020-03-13 18:02:10 +01:00
spookydonut 4ca8f8086c Remove ui deadcode (curse you) (#49864)
Aha cheers!~
2020-03-13 07:07:01 +02:00
skoglol b94cf14b8a Merge pull request #49235 from Bawhoppen/prisoners
Redesigns and Expands Permabrig
2020-03-13 05:08:24 +01:00
Bawhoppen ff427395bf final map fixes 2020-03-12 22:28:25 -05:00
Iamgoofball 6284eecded Adjust some Families objectives based on feedback. (#49882)
* Adjust some Families objectives based on feedback.

* Update gang.dm

* Update gang.dm
2020-03-12 13:47:31 -04:00
cacogen c8c0685288 Replaces parent wand with wand of nothing on Donut (#49887)
* Replaces parent wand with wand of nothing on Donut

- Renames parent wand 'wand' to distinguish it from wand of nothing
- Simplifies parent wand's description to focus on the fact you shouldn't have it
- Makes parent wand delete itself when fired
- Renames parent magic projectile bolt to differentiate it from bolt of nothing

* prototype wand deletes itself on spawn

* removes snowflakey qdel of the base wand on spawn
2020-03-12 13:35:47 -04:00
TetraK1 b3abcaac9d Improve shuttle calling dialog order 2020-03-12 12:36:38 +00: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
Bawhoppen 88c1f1812f serving dish + cafeteria tray 2020-03-12 04:47:28 -05:00
ShizCalev 19034e3d77 randomize the cans 2020-03-12 02:48:14 -04:00
ShizCalev 7ddc9511f2 Fixes spawned IEDs not having cans 2020-03-12 02:35:38 -04:00
ShizCalev ef6796c4d4 Fixes undercover cop sunglasses not having flash protection 2020-03-12 02:23:16 -04:00
Tlaltecuhtli 404a26c74d aloe medical plant addition (#49444)
* 1

* 2

* removal of id and names

* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/stacks/medical.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* Update code/game/objects/items/stacks/medical.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* lowers price for med suture

* one aloe microwaved to 2 paste

* changes grind

* 🍆

* Update lavaland_surface_ash_walker1.dmm

* merg conflic

* ????????????

* Apply suggestions from code review

* reset travis

* reverts travis reset commit

cringe cringe cringe

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-03-11 11:54:41 -04:00
RaveRadbury 646cd22022 Hug Fix (#49860)
* flip flops the negative modifier

This is because when temp_diff is less then 0 it is a negative number.

* modifies the code as requested

* Halves the heat transferred to actually balance out body heat.
2020-03-11 11:33:06 -04:00
Fikou da0da14276 lowers advanced rcd upgrade price (#49862) 2020-03-11 11:11:58 -04:00
ShizCalev c13bfd34f0 Merge pull request #49866 from Ghommie/patch-1
Webedit touching the MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING speed modifier.
2020-03-11 02:36:22 -04:00
tralezab 70af311909 ahaha (#49857) 2020-03-11 12:46:53 +08:00
LemonInTheDark 0007cb1381 Fixes SR not working when the holder is empty (#49779)
We do this by moving it's callback from the reagent itself to the mob. The callback proc has also changed,
I've added the behavior to revive(), based on the preseance of excess_healing in the arguments.
This is a little snowflakey but the behavior is consistent.
2020-03-10 20:30:44 -04:00
Bobbahbrown 8ba15b5ea8 [s] Fixes XSS Exploit Defeating Sanitization of Any String in Goonchat (#49867)
* fix

* cleanup

* renamed that one function

* fixes for users who do not have 5 entries
2020-03-11 09:29:37 +13:00
Ghom e6ad3e3fc4 Update human.dm 2020-03-10 14:27:23 +01:00
Timberpoes f5cb1d471b Fixes the handheld arcade game not working as intended (#49823)
* Fixes the handheld arcade game not working as intended

* Removed misleading parameter from ui_act

* Further fixes in light of build errors
2020-03-10 18:39:02 +08:00
Fikou 367f85440c pirate captain (#49837) 2020-03-10 18:36:43 +08:00
tralezab adba2264fe fixes nightmares not getting nightmare names (#49835)
* NICE

* even nicer
2020-03-10 16:43:55 +08:00
Dennok b53537533b Change cable layer only in hand. (#49852)
Now you can change cable layer only in hand
2020-03-10 01:32:39 -07:00
Ryll Ryll cd28642f35 Restores ops normal combat gloves, adds Guerrilla Gloves to their uplink (#49818)
* oopsie

* spell
2020-03-10 16:16:26 +08: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
ShizCalev 32db49f4f6 Merge pull request #49810 from Dennok/fake-flood-fix
fake flood fix
2020-03-10 01:13:20 -04:00
Arkatos1 e9bc48632c tgui: AI system integrity restorer (#49828)
* AI fixer UI

* Cleanup

* Polish
2020-03-09 22:12:13 -07:00
Ryll Ryll 7e7fe53fdf Adds Weekend at Bernies'ing People (#49749)
* in addition to the meme i also fixed some comments!

* Update code/modules/mob/living/carbon/human/examine.dm

Co-Authored-By: Jordie <4343468+Jordie0608@users.noreply.github.com>

Co-authored-by: Jordie <4343468+Jordie0608@users.noreply.github.com>
2020-03-09 22:03:32 -07:00
Timberpoes 0467f4094d Fixes limb hot-swapping not working (#49792) 2020-03-09 19:11:15 -07:00
AnturK 108cd4da9f Fixes player panel handling " (#49793) 2020-03-09 19:08:48 -07:00
Qustinnus c175387ba0 New random event: Wisdom cow (#49719)
* wisdom cow

* smoke

* fine he speaks more wisdoms now

* pronouns

* Update code/modules/mob/living/simple_animal/friendly/farm_animals.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* for

* smoke1

* smoke2

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2020-03-09 19:01:49 -07:00
Dennok 7826dd68f0 Slime split fixes. (#49734)
* Adult slimes death fix.

Adult slimes on death drop split on turf.

* Slime sptil fix.

Slime appears on turf on split.

* Slime split fix.

Slime don't split while in closet, etc.

* drip of flexibility

Co-Authored-By: XDTM <heliumt@yahoo.it>

* drip of flexibility

Co-Authored-By: XDTM <heliumt@yahoo.it>

* drip of flexibility

Co-Authored-By: XDTM <heliumt@yahoo.it>

Co-authored-by: XDTM <heliumt@yahoo.it>
2020-03-09 18:56:42 -07:00
Mickyan f01db6f044 wig mimicry 2020-03-09 20:19:44 +01:00
XDTM 6eea85372f Fixes nanite comm remotes (#49798) 2020-03-09 14:54:22 -04:00
spessbandit a3a3b29719 Adds pruno, aka prison wine, to the game. (#49615)
* adds pruno; adds garbage bags to all map permas for pruno; adds moldy bread for pruno

* tells travis to eat shit

* ups time to make pruno; tweaks recipe

* changes moodlet, breaks mold into separate reagent, slightly tweaks recipe display

* travis please eat every dick in existence except for one and then continuously clone-a-willy that dick so you can continue this task for all eternity

* changes disgust, adjusts comments

* does this fix the shit

* does THIS work

* spooky's edits
2020-03-09 15:29:58 +08:00
AnturK f3dc65e5f3 Fixes runtime when rotating onpipe freezer (#49766) 2020-03-09 15:28:04 +08: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
cacogen 6ea19f23d3 Clothing armour values on examine (#49571)
* Clothing armour values on examine

* relearn year 1 maths

* it's a link now

* PROTECTION CLASSES (I-V)

rating system is worthless if you don't know the range

* nothing i do seems complex enough to autodoc

but here is a good attempt

* armor classes now split between armor and durability

* Update clothing.dm

* i program my home computer

* oh i'm sayin it

* underline instead of blank line

too many lines makes it hard to compare values

* autodoc i hope it's good

* autodocs proc properly

- changes vague number var to armor
- renames proc to be more descriptive
- makes it so armor value rounds to nearest 10 instead of implicitly rounding down to 1 sig fig
- changes armor readout formatting to hopefully look better
- simplifies code by dividing the armor value by 10 before converting to roman numerals
2020-03-08 20:32:58 -04:00
ArcaneMusic 0ca12b5439 Adds a new combat medic hardsuit, exclusive to the blackmarket. (#49148)
* Initial Commit, hot new combat medic hardsuit for the blackmarket

* This time I'll actually finish my sente

* Hardsuit can now hold pillbottles, First Aid Kits, and individual medical bits

* Updates armor values, nice in-between from medical and security values now.

* Kryson's frontsprites and I reworked the other ones to match.

* Rogue pixel. We're good now.

* And this helmet too.

* Lets try not to harass me in the future.

* It can use the default cell, sure.

* True

* Check?
2020-03-08 19:48:41 -04:00
Dennok a1cc315bc1 lowercase 2020-03-08 23:03:42 +02:00
ArcaneMusic 0445fb4996 Cats cannot catch pray smarter than them. (#49609)
* Cats cannot catch pray smarter than them.

* hey, at least I added a cooldown to the emote this time.

* Classic cat n mouse

* Sorry, I can't glean a complete thought through one emoji.

* Damnit.

* Longer var name
2020-03-09 01:48:57 +08:00
moo 5da1890d53 bzzt (#49781) 2020-03-08 20:13:58 +08:00
Dennok d8878973cc fake flood fix 2020-03-08 12:54:07 +02:00
zxaber 3b921a7f9f Cost cutting (#49611) 2020-03-07 20:57:19 -05:00
skoglol 847a7a0090 Merge pull request #48935 from LemonInTheDark/night-code
The Supermatter Zaps with honkers and blackjack [Ready]
2020-03-07 04:40:17 +01:00