Commit Graph

374 Commits

Author SHA1 Message Date
fluffe9911 d78bb9152b Adds the golem Time-Green was too communistic to add (#42475)
* capitalism is the true way

* better sound clip

* there we go

* fixes mine and time-greens copy pasta

* adds the soviet golem to the human file

* capatalist golems now bleed money

* makes it so both capatlist and soviet golems can now use guns

* hec

* makes the song the U.S.A Anthem to please the copyright gods and removes money bleeding cause im to lazy to do a refactor right now

* Update code/modules/mob/living/carbon/human/species_types/golems.dm

Co-Authored-By: fluffe9911 <dablank02@hotmail.com>

* re

* better sound clip
2019-01-25 15:38:07 -05:00
Time-Green 9861efde71 Cryokinesis and Geladikinesis mutations (#42453)
* Adds cryokinesis and renames the cold resistence file to space adaptation

* adds cryokinesis

* fixes icon conflict

is there actually a proper way to fix them thats not copying master and reimplimenting your own sprites?

* fixes a typo and lowers instability of cryokines by 5

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* maybe reverts line ending?

* unfucks flags?

* probably unfucks line endings

i swear to fucking god why does it even do this. i never even touched the file and reverting it to master doesnt do anything. fuck you git
2019-01-23 15:20:56 -05:00
Time-Green b245f1ed5a Adds the golem Qustinnus was REALLY too afraid to add (#42402)
Stalinium is currently unavailable, so it's an admin only golem
cl Time-Green
rscadd: Adds glorious soviet Russia golem
/cl
2019-01-22 15:30:46 +13:00
Qustinnus 62f61a5867 [READY]New durathread content and durathread modifications (#41959)
* durayeet

* Update code/modules/clothing/head/jobs.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/head/beanie.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/masks/miscellaneous.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/under/miscellaneous.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* yeet

* adds armor

* webedits yeet

* adds crafting stuff and removes normal cloth crafting

* ff

* final fixes

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* done
2019-01-02 14:31:06 -05:00
kevinz000 45b5bc20fb Adds sofas 2018-12-02 10:21:19 -08:00
coiax 446641f329 Repath blindfolds to prevent regular sunglasses creation exploit (#41710)
Blindfolds don't actually need to inherit anything from sunglasses, from what I
can see, unless there's some bad type checking somewhere in the code that I'm
not aware of.

Exploit is: cloth makes blindfold + medHUD -> medHUD sunglasses -> remove
medHUD, regular sunglasses.
2018-11-30 14:21:22 -08:00
swindly 4bcd3cdc55 fixes word crimes 2018-11-19 17:56:59 -05:00
FantasticFwoosh 05fed1f0c9 changes amount of floortile per mat (#40990)
previously made 2 a piece respective of lavaland tile placing rules that aren't relevant anymore.
2018-10-18 14:01:23 -04:00
MMMiracles e5c1a858cb durathread fix (#40685) 2018-10-05 04:33:58 -04:00
MMMiracles 5ee8a6bb1f Adds clothing production for Botany (#40563)
cl MMMiracles
add: Botany can now grow cotton to produce cloth for various jumpsuits.
add: Cotton can be mutated into a much more durable strand, allowing for the production of crude armor.
add: Rainbow flowers, an alternative for clothing dyeing, is obtainable through cargo's exotic seed crate.
add: A loom can now be crafted with some planks so you can actually weave that cotton into a usable fabric.
add: Fannypacks, softcaps, beanies and scarves are now craftable with cloth and dyeable.
/cl

[why]: A way to produce clothing and naturally obtain cloth past ripping up other stuff seemed useful and with the economy aspect, might actually have some extra use.
2018-10-03 10:13:34 +13:00
FantasticFwoosh f70698b7cc Adds fancy boxes to cardboard crafting & flour sacks + UE designs to biogenerator. (#40394)
* Adds fancy box types to cardboard recipies

So now with co-operation the chef can mass stock eggs & donuts, while the chaplain can hold reserve candles.

* Tidies up syntax

Missing comma threatens derail, oversight fixed.

* Adds UE & flour sacks to biogen designs

Adds universal enzyme (reagent transferred into biogenerator container) & flour sacks to the biogenerator designs.
2018-09-29 02:03:23 +03:00
vuonojenmustaturska de357a79d8 Adds plasmaglass shards, they can be made into spears (#40327)
* stuff and things

* adds back missing gonbola

* remove useless var

* slapcrafting fix

* transfer memes
2018-09-19 23:05:43 +02:00
Militaires 4cbd009876 [READY] Gondola Fur Products and Gondola Mask Voice Changer (#39670)
* Gondola Fur Products

* hands filled in

* voice changer

* perfect

* epic >>>> ebin

* removes Ecks Dee
2018-08-18 15:26:59 -04:00
81Denton 044279e845 Adds missing merge_type to mineral sheets (#39054) 2018-07-11 13:15:30 +03:00
Trevor Serpas bee0b5b2c3 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 02:00:25 -04:00
Tad Hardesty 211978cbb2 Fix light tile creation 2018-06-30 12:33:49 -07:00
ShizCalev 89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
YPOQ d4136f4a65 Fixes gulag stacker not giving points after RPG loot event (#38570)
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
2018-06-21 17:30:13 -04:00
ShizCalev ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Tlaltecuhtli fd6812acf0 sdasd 2018-06-13 14:38:24 +02:00
vuonojenmustaturska c65a99f130 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 11:36:31 +02:00
ShizCalev c41d6ac965 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-30 21:57:06 -07:00
Jordan Brown f3db0f57e0 Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay
Fix various bugs with telekinesis
2018-05-25 11:48:50 -04:00
MrDoomBringer 32c8d0abc5 Cargo Update: Cargo Supplypod Beacons! (#37345)
(THE CODEX ASTARTES CALLS THIS MANEUVER: STEEL RAIN) [New sprite!]

* file

the boy

asdh

beacon overlays

first pass complete bring out the drinks boys

fixes!

fixes!

whups fix name

speed

makes coffin a crate to prevent runtimes

sprite fuckup:the musical

whups more fixes

why tf was screengen modified???

TO THE FILE

devices

changes things

p[omf pomf

uhg

alright fuk it

issue fix pt 1

in which i make merge conflicts my bitch

by fixing devices.dmi and tgui.js

oh shit

forgot about the items repath

hm

nah

merge conflict a

then all ya gotta do is whip

* shiv review me code reeeeeeeeeeeeeeee

* rebase conflict

* anturk

* asdf

* wooooeeeeeeh makin bacon

* dont forget about lil old me

* id like to give a shoutout, to my man spacemaniac. on the soul plane. rip in peice, my bugs. rip in peice

* spacy man what is ur spacy plan

* 1st

* 2nd

* organization also a thing

* so i figured out why defines didnt work sometimes across files. this fixes the last issue rn

* forgot to cop the commit

* fuck how am i so stupid

* adds comments and agrees with spacemaniac

* asdfghjk
2018-05-24 17:02:51 -07:00
Tad Hardesty 7a83c0dca5 Fix TK teleporting filled sandbags 2018-05-23 16:49:27 -07:00
vuonojenmustaturska 8f72860a48 Merge pull request #37846 from DaxDupont/axe-time
Small cult nerf do not be alarmed robustin think about your heart
2018-05-16 12:46:30 +03:00
Dax Dupont d2ad0bd603 Kills bloodcult space base memes 2018-05-14 19:17:25 +02:00
FrozenGuy5 12a9090400 Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464)
* Update smelting_designs.dm

* Tweaks material values on titanium glass.

* Optimizes math & fixes errors and inconsistencies
2018-05-12 23:04:07 -07:00
YPOQ 2b141c3e39 Fixes new stacks getting merged before the stack size is set 2018-05-08 22:20:56 -06:00
ShizCalev ba1030f803 Makes more messages pronoun sensitive (#37582)
* Makes more messages pronoun sensitive

* Some cleanup

* more pronouns

* rever
2018-05-03 18:45:55 -04:00
Jordan Brown d132f97061 Merge pull request #37568 from pigeonsk/removeenruranium
Removes enriched uranium
2018-04-30 22:16:02 -04:00
Pigeons cc1391fc68 Removes enriched uranium 2018-04-29 20:26:58 -04:00
pigeons 96e384448c Actually links mineral sprites with their new location (#37564)
Fixes sprites being broken
2018-04-30 12:07:47 +12:00
81Denton 849adf62d3 adds grind_results to coins and diamonds (#37403) 2018-04-25 07:04:06 -04:00
Fox McCloud 057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
vuonojenmustaturska 287ee756e8 Adds two new intermediate beaker types to chemistry (#36484)
* a commit

* rebase

* 180
2018-03-19 20:22:32 -04:00
Ashe Higgs ab9e2e8902 Adds minor roundstart traits! (ala CDDA, etc.) (#35440)
* Roundstart traits

* Unspaghettifies night vision

* Fuck everything

* Issues patch
2018-03-02 13:39:44 +13:00
Ashe Higgs d1edd8f505 Alternative PR to brass apples: Adds bronze sheets (#35874)
* Adds bronze sheets

* nope!
2018-03-02 13:35:58 +13:00
XDTM b49798c483 Converts several species traits into generic traits (#35743)
* Converts several species traits into generic traits

* 2hot
2018-02-26 10:47:58 +13:00
Ashe Higgs 7c38e7eac3 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-26 09:50:16 +13:00
ShizCalev 4b7297d576 Sheet icon fixes (#35772)
* Fixes sheet inhands

* Fixed transparency

* Ore fixes
2018-02-19 03:36:13 -05:00
Jordan Brown d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
uraniummeltdown ac9964be70 Buildable Shuttle/Plastitanium Windows (#35376)
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-10 18:49:43 -05:00
ACCount 100c4b6114 Adds new helper: use_tool, shakes things up in tool code (#35095)
* small changes

* Adds a use_tool helper and changes some tools to use it

* Ports most tool operations to use_tool

* Converts more tool operations to use_tool and tool_act

* Changes some things to default_unfasten_wrench

* Improves tool_behavior support in mech construction

* Code review memes

* Fixes all instant use_tool calls failing

* Code improvements

* merge fixes
2018-02-06 11:02:53 +01:00
vuonojenmustaturska c4fd8715a5 Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291)
* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
2018-02-05 22:27:35 +01:00
Ashe Higgs 6ba865b112 makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)
* traps patch

* flags!
2018-02-02 11:14:38 +01:00
Robustin 418a8c0112 Cult Update (#33810)
* Cult overhaul
2018-01-30 21:59:03 +02:00
MrDoomBringer 20a6c0cdd7 Adds ~70 more suicides (#34522)
Does what it says on the tin, probably a terrible idea
2018-01-23 20:38:31 +13:00
oranges afd92a5b12 Merge pull request #34464 from uraniummeltdown/dumbcult
Removed the dumb iscultist() check in runed metal's attack() proc
2018-01-17 09:31:15 +13:00
uraniummeltdown 8d5030f3a7 rename all 'clown' to 'bananium' for bananium mineral objects (#34462) 2018-01-15 23:02:18 -05:00