Commit Graph

2213 Commits

Author SHA1 Message Date
Joan Lung
ee9814465c Fixes a bit of brasscode 2016-09-13 17:11:57 -04:00
Cheridan
2a0168abdb Merge pull request #20434 from ChangelingRain/idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Moves all beam icon states to beams.dmi
2016-09-13 11:55:24 -05:00
Joan Lung
0067bd1332 Adds brass, used to construct various brass objects (#20419)
* Adds brass, used to construct various brass objects

* brasshole

* give em the brass

* give em more brass

* DYNAMIC

* VAR MURDER SPREE

* brassy

* acceptaphil

* this is super against my general preferences but eeeeeh sure okay i guess
2016-09-13 12:16:28 +02:00
Joan Lung
9c6fdc97f6 Makes mineral doors marginally less shitty (#20429)
* Makes mineral doors marginally less shitty

* TESTING IS FOR LIZARDS

* TYPING IS ALSO FOR LIZARDS
2016-09-13 09:19:21 +12:00
Joan Lung
179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi
2016-09-12 17:14:39 -04:00
PKPenguin321
f2b6543c1b tesla grille nerf (#20412) 2016-09-13 09:07:47 +12:00
Remie Richards
c50fa5729c Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work 2016-09-10 20:28:23 +01:00
Joan Lung
fbe2430ff8 Moves all beam icon states to beams.dmi 2016-09-10 13:09:44 -04:00
Cheridan
94bb371f30 Merge pull request #20402 from ChangelingRain/iwasabillionlittlepiecestilyoupulledmeintofocusastronomyinreverseitwasmewhowasdiscovered
Makes cult structures destructible and readds them
2016-09-10 11:43:59 -05:00
Joan Lung
5bdfd1665f Merge pull request #20328 from Ergovisavi/bring_colossus_back_2016
New colossus loot, the "Anomalous Crystal"
2016-09-08 22:38:50 -04:00
Joan Lung
b245319979 Adds some very fancy tables (#20388)
* Adds some very fancy tables

* even fancierer

* smoothing sprites are like a jigsaw puzzle for assholes
2016-09-09 14:09:16 +12:00
Joan Lung
eec5ca0823 that which is done is done 2016-09-08 10:13:13 -04:00
Ergovisavi
4e4f091905 Merge branch 'master' of https://github.com/tgstation/-tg-station into bring_colossus_back_2016 2016-09-07 01:08:58 -07:00
Ergovisavi
8605809c57 New colossus loot, the "Anomolous Crystal" 2016-09-07 00:58:15 -07:00
oranges
aa4fc60434 Merge pull request #20291 from jughu/Mission-oxy
Guarantees a breath mask in oxygen lockers
2016-09-05 08:41:05 +12:00
Cheridan
5304510121 Merge pull request #20303 from ChangelingRain/shootmedownofcourseimthesinfuloneherebutnowivefoundareasontofeelnofear
Bubblegum's charge now goes the full distance to the target
2016-09-04 13:38:25 -05:00
Joan Lung
266bacf4c8 Bubblegum now charges past its target's location 2016-09-03 12:09:08 -04:00
jughu
a568fb9632 fixes the emergency locker 2016-09-03 01:07:41 +02:00
Remie Richards
aa7ae7dc38 Fixes cloth from cutting bedsheets ending up INSIDE THE USER (#20286) 2016-09-02 12:40:16 -05:00
Remie Richards
897e8c5b88 Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
2016-09-02 18:04:18 +01:00
Remie Richards
00738bd2a3 More than 2 hands!? WHAAAAAAT 2016-09-02 16:10:16 +01:00
oranges
8b5697f37d Merge pull request #20175 from bgobandit/functionality
You can hide small items inside urinals now.
2016-09-02 14:58:38 +12:00
Kromgar
2b235b8bba Revert "Fixes issues with packagewrap, trashbag, handlabeler, " 2016-09-01 12:18:24 -04:00
oranges
00495cedc5 Merge pull request #20186 from phil235/InsertFix2
Fixes issues with packagewrap, trashbag, handlabeler,
2016-09-01 10:13:30 +12:00
KorPhaeron
7b2a1b6aa7 Fixes another batch of typos. (#20234) 2016-08-30 21:52:19 -05:00
bgobandit
27e355d16b Fixes another batch of typos. 2016-08-30 20:57:28 -04:00
bgobandit
250ad0f213 untypecasts 2016-08-30 19:02:09 -04:00
phil235
42301f32e2 Fixes issues with packagewrap, trashbag, handlabeler, and other potential items that must have an effect when clicking a storage item. Clicking a storage item with those items does not try to insert them in the container but instead calls their afterattack effect directly. The var used for those items is var/no_direct_insertion.
Fixes trashbag not being able to pick up pillbottles, evidence bags.
Fixes packagewrap not being able to wrap backpacks, pillbottles, all sorts of bags.
Fixes packagewrapping a locked lockbox showing "it's locked!"
Backpack only make rustling noise if insertion is successful.
2016-08-28 19:38:15 +02:00
bgobandit
2aaf9d64f4 requested urinal changes, sprite added 2016-08-28 10:11:37 -04:00
bgobandit
c77b74e90a You can hide things inside urinals now. 2016-08-28 03:39:44 -04:00
PKPenguin321
08ecbf63ee fixes grilles exploding machines 2016-08-27 13:37:28 -07:00
TechnoAlchemist
6cb1bda8e4 Adds a seclite to the detective's closet. 2016-08-22 13:21:31 -07:00
Incoming5643
f64e2664be Lets lattice spawn in ruins by removing overzealous deletions (#19965) 2016-08-20 17:03:18 -05:00
oranges
4feb383535 Merge pull request #19904 from ChangelingRain/refusethetrappingsofalifethatwouldseeyoudeadandweaveyourownfromotherpeopleslifegivinglives
Containment fields can no longer contain megafauna
2016-08-18 14:14:45 +12:00
Joan Lung
cbf733dbc4 Does something, likely to be important, to blob (#19831)
🆑 Joan
rscadd: Once the blob alert message is sent in the blob game mode, all mobs get to see how many tiles the blob has until it wins, via the Status tab.
rscdel: Removed/merged a bunch of blob chems, you probably don't care about the specifics.
tweak: The remaining blob chems should, overall, be more powerful.
tweak: Shield blobs soak brute damage less well.
tweak: Flashbangs do higher damage to blobs up close, but their damage falls off faster.
experiment: Shield blobs now cost 15 resources to make instead of 10. Node blobs now cost 50 resources to make instead of 60.
experiment: Expanding/attacking now costs 4 resources instead of 5, and blobs can now ATTACK DIAGONALLY. Diagonal attacks are weaker than normal attacks, especially against cyborgs(which may be entirely immune, depending), and they remain unable to expand diagonally.
rscadd: Shield blobs no longer block atmos while under half health. Shield blobs are still immune to fire, even if they can't block atmos.
tweak: Blobs should block explosions less well.
rscadd: Blob cores and nodes are no longer immune to fire and no longer block atmos.
rscadd: Blobs can only auto-expand one tile at a time per expanding thing, and should be easier to beat back in general.
tweak: Blobbernauts now attack faster.
tweak: Blob Overminds attack mobs slower but can attack non-mobs much faster.
rscadd: Blob Overminds start with some amount of resources; in the gamemode, it's 80 divided by the number of overminds, in the event, it's 20 plus the number of active players, and otherwise, it's 60.
bugfix: You can no longer move blob cores into space, onto the mining shuttle, white ship, gulag shuttle, or solars.
bugfix: Blob rounds might be less laggy, if they were laggy?
tweak: Blobs don't heal as fast, excluding the core.
experiment: Blobs are marginally less destructive to their environment.
/🆑

Objective:
maybe possibly make blob something you can fight instead of wishing the blob didn't exist?
but also make the blob lethal enough that it can still deal with the crew if it knows what it's doing(and still lose if the crew is good instead of snowballing forever)
2016-08-17 15:48:28 +12:00
Joan Lung
c5b41ce045 certainly creative, if inefficient. 2016-08-15 18:56:12 -04:00
Joan Lung
79b226feb8 The Ark of the Clockwork Justicar can now be constructed even if Ratvar's rise is not an objective (#19864)
* The Ark of the Clockwork Justicar can now be constructed even if Ratvar's rise is not an objective

* you're so fucked

* behold

* clang
2016-08-16 10:24:36 +12:00
oranges
bbf8889d9c Merge pull request #19810 from KorPhaeron/blueprint_fix
Refactors area creation
2016-08-15 00:01:00 +12:00
KorPhaeron
43a16713f1 Blueprints for everyone 2016-08-11 04:04:16 -05:00
KorPhaeron
2a71f7e3b2 Fixes realism issues with rapiers being able to dismember (#19779)
* Rapier Fixes

* Typo

* Rapiers are not canon

* Removes rogue apostrophe
2016-08-11 15:43:18 +12:00
Joan Lung
ef67937976 Dreamstation's mini station map now has a metastation-like description (#19781) 2016-08-09 13:23:06 -05:00
Arctophylax
d374ff92e6 Fixes Kitchen Spike Buckling (#19712) 2016-08-05 17:00:52 -05:00
unknown
5ea9203c7f Added some has_buckled_mobs() checks. 2016-08-02 23:39:29 -07:00
Lularian
feafb59f0e 111111111111111 2016-08-01 16:58:34 -05:00
bawhoppen
1fecd12aaf no really who is da king (#19537)
add: Added crowns. Make them from gold. Cap gets a fancy one.

Crowns get some armor but are overall worse than sec gear.
2016-08-01 13:58:11 +12:00
oranges
68e85feb47 Merge pull request #19589 from ChangelingRain/ahorriblewishacursecutshortawantsodeepitrunsinboneandbrain
Simple animals can now have a set amount of damage to deal to objects in place of normal melee damage
2016-08-01 10:57:45 +12:00
Joan Lung
bcfe0be2d0 Potted plants now layer properly (#19546)
* Potted plants now slow you down slightly

* we manage to pull her away

* no message
2016-07-30 12:18:12 -05:00
Joan Lung
60b32ddd85 Simple animals can now have a set amount of damage to deal to objects in place of normal melee damage 2016-07-30 09:14:53 -04:00
NikNakFlak
a7b6e60d65 Sprite changes for bedsheets/signs, minor code cleaning (#19377)
* Bedsheets, sprite changes, sign

* Spelling

* Ugh, oldcode ew

* More more more

* does a thing

* Holy shit batman, this map merging thing sucks
2016-07-28 21:02:33 +12:00
Thunder12345
1220d02aca Rapiers (#19340)
* Adds Rapiers
2016-07-26 15:14:11 +02:00