Commit Graph

2088 Commits

Author SHA1 Message Date
Fox McCloud
38d2273517 Fixes Blast Cannon (#37503)
* Fixes Blast Cannon

* no magic numbers

* tweak
2018-04-30 10:54:48 +01:00
vuonojenmustaturska
ac053bd9a2 Kills off three more flags from flags_2 (#37529)
code: More flags have been moved to their appropriate places
SLOWS_WHILE_IN_HAND
FROZEN
NO_MAT_REDEMPTION

all moved to item_flags
2018-04-29 23:33:52 +01:00
iksyp
87ca69efaf Makes pacifists able to use .50BMG Soporific Rounds (#37506)
* non lethal .50BMG

* no more spaghetti sauce?

I havent actually tested this
2018-04-29 16:14:35 +01:00
Jordan Brown
3c65de23ee Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 20:57:06 +01:00
Ling
e1f663ac4a Merge pull request #545 from yogstation13/upstream-merge-37476
[MIRROR] Uppercases slot defines.
2018-04-28 16:11:40 +02:00
oranges
feca7a7b38 Uppercases slot defines. 2018-04-28 09:49:08 +01:00
as334
1570bd46f3 Re-adds and reworks fusion. (#37384)
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 09:48:08 +01:00
Fox McCloud
d42a67da02 Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 14:01:33 +01:00
vuonojenmustaturska
9a3903ff0f Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
2018-04-18 15:33:07 +01:00
vuonojenmustaturska
4a281609cb fixes applying KA mods on the minerborg (#37137) 2018-04-13 13:50:12 +01:00
iksyp
e3656a7619 Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful (#36670)
fix: makes dragnet non harmful
tweak: pacifists can now use any disabler or stun setting on any energy gun
code: removed all of the pacifism check code from code/modules/mob/living/living.dm
code: gun objects no longer have a harmful variable, instead, ammo_casing objects now have a harmful variable, which is by default set to TRUE
code: if a pacifist fires a gun, it checks whether or not the round chambered is lethal, instead of whether or not the gun itself is lethal.
2018-04-11 11:00:02 +01:00
KorPhaeron
591b9e0e01 Fixes staff of change borgs recieving AI laws (#36785)
* Fixes staff of change borgs recieving AI laws

* lawupdate
2018-03-30 19:41:42 +01:00
vuonojenmustaturska
db3c4dca69 Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-27 18:57:16 +01:00
kevinz000
3e4ffeab00 Fixes wormhole projectors (#36622) 2018-03-26 23:20:32 +01:00
XDTM
78e5af566a Replaces sniper bullets ex_act with bonus obj damage (#36715)
* Replaces sniper bullets ex_act with bonus obj damage

* Update sniper.dm

* Update sniper.dm
2018-03-26 23:18:11 +01:00
AsV9
d338cac150 Merge remote-tracking branch 'tgstation/master'
Not sure if this worked. Used a wonky special snowflake strat to merge.
2018-03-24 08:57:13 +01:00
Qustinnus
c69141772d fix (#36576) 2018-03-22 08:41:38 +01:00
Qustinnus
36e91a327b [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)
cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.
2018-03-18 07:49:31 +01:00
Ling
4cea72a10b Update shotgun.dm 2018-03-17 14:51:31 +01:00
Ling
958b47d08c Update shotgun.dm 2018-03-17 14:51:03 +01:00
Cruix
1f12f91b8a Added clown ops game mode, and several clown weapons. (#36459) 2018-03-17 07:42:04 +01:00
PKPenguin321
f3611fef4a harmful var for guns (#36265)
* harmful var for guns

support for pacifism to use non-harmful guns

* fixes bad spacing

oops
2018-03-10 02:11:57 -06:00
kevinz000
4f2d98b27e Projectiles delete on invalid turf (#36073) 2018-03-09 09:25:49 +01:00
Jordan Brown
8a0556d734 Lol @optimumtact 2018-03-08 15:13:05 -05:00
Qustinnus
5140cff38c [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] (#35475)
Floyd / Qustinnus (Sprites by Ausops, Some moodlets by Ike709)

add: Adds mood, which can be found by clicking on the face icon on your screen.
add: Adds various moodlets which affect your mood. Try eating your favourite food, playing an arcade game, reading a book, or petting a doggo to increase your moo. Also be sure to take care of your hunger on a regular basis, like always.
add: Adds config option to disable/enable mood.
add: Indoor area's now have a beauty var defined by the amount of cleanables in them, (We can later expand this to something like rimworld, where structures could make rooms more beautiful). These also affect mood. (Janitor now has gameplay purpose besides slipping and removing useless decals)
remove: Removes hunger slowdown, replacing it with slowdown by being depressed
imageadd: Icons for mood states and depression states


What this PR is

This PR adds a system that allows player to gain and lose moodlets based on events occuring to, and around them. These events then give the player a mood value based on what it is. For example a hug could give you +1 mood, while being stabbed in the eye with a screwdriver can give -5 mood. All these moodlets together determine the mood of your character which currently affects the following things:

    Movement speed - If you are very sad you move slower. Replacing movement slow from hunger. (hunger now instead affects mood)
    Screen blur - If you are sad you gain an overlay that slightly blurs the screen, increasing in severity as you get sadder.
    Interaction / do after speed - If you are sad or happy your interaction speed with things such as handcuffs is changed. with a 25% longer time if you are sad, or 10% shorter time if you are extremely happy.
    Hunger rate - You gain hunger slower if you are very happy.
2018-03-08 14:15:57 +13:00
Dax Dupont
f8c5febcc8 Beacons are no longer radios (#36070)
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
2018-03-07 14:43:12 -06:00
kevinz000
79dd910f02 Varedit exploit 2018-03-05 10:20:51 -08:00
kevinz000
f5ae06565c Splits up projectile files (#36018) 2018-03-04 17:10:46 -05:00
vuonojenmustaturska
440e888c1f Clean up all sorts of crap, mostly defines (#36105)
* cleanbot

* rejuv

* more crap

* more crap

* still compiles

* clean

* is_crap
2018-03-05 02:07:27 +11: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
oranges
d21134efd2 Merge pull request #35923 from kevinz000/i_betrayed_naksu
Fixes hitscans, and this time, properly
2018-02-27 09:21:45 +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
XDTM
2ac902ab3c Refactors anti-magic into a component (#35639)
* Refactors anti-magic into a component

* plenty o stuff, mainly holy and antimagic traits

* fix

* fix2

* moved to components, moved some of the logic to the component

* don't blame me if the code looks copypastey

* right
2018-02-26 09:45:12 +13:00
astralloop
81c6c8e2a3 Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#35906)
* Syringe dartguns!

* Fix wording

* And then I said, 'I fixed it all!'

* Make it 12TC
2018-02-23 21:01:35 +02:00
kevinz000
9063022270 Fixes Hitscans 2018-02-23 01:45:04 -08:00
ExcessiveUseOfCobblestone
336f26c141 Change-Projectile cleanup (and now you can be ANY* species) (#35710)
cl Cobby
experiment: Being hit by a bolt of change now opens up previously-barred races. Hopefully you don't roll plasmaman!
/cl

    If the subtype for the species was added hehe

I was going to brag about how there wasn't any balance change but this does allow for more of the "fun" races within humans to come up.

Webbit so probably some dumb typo somewhere
2018-02-20 09:53:34 +13:00
Joan Lung
3cba04eb83 Improves mining voucher choices and minebots (#35633)
cl Joan
tweak: The crusher kit now includes an advanced mining scanner.
tweak: The resonator kit now includes webbing and a small extinguisher.
tweak: The minebot kit now includes a minebot passthrough kinetic accelerator module, which will cause kinetic accelerator shots to pass through minebots. The welding goggles have been replaced with a welding helmet, allowing you to wear mesons and still be able to repair the minebot without eye damage.
feature: You can now install kinetic accelerator modkits on minebots. Some exceptions may apply. Crowbar to remove modkits.
balance: Minebots now shoot 33% faster by default(3 seconds to 2). The minebot cooldown upgrade still produces a fire rate of 1 second.
balance: Minebots are now slightly less likely to sit in melee like idiots, and are now healed for 15 instead of 10 when welded.
balance: Sentient minebots are penalized; they cannot have armor and melee upgrades installed, and making them sentient will override those upgrades if they were installed. In addition, they move very slightly slower and have their kinetic accelerator's cooldown increased by 1 second.
/cl

the basic scanner sucks ass and nobody wants to use it, it's actually hilarious
also in those stats: minebot picked a mere 6 more times than the conscription kit, because it's an idiot drone, easy to accidentally hit, and did I mention how much it likes going into melee?

tbh it's quite possible the extra buffs aren't needed, just the passthrough module, but it's better to go a little too far rather than not far enough.
2018-02-20 09:49:49 +13:00
kevinz000
c3060022a7 [READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams. (#35344)
* Cross Z support

* Fixes projectile cross-Z

* removes unnecessary code

* don't draw impacts if you're not impacting

* fix

* unneeded var

* No mapcheck()ing anymore, space does it for us 2.0
2018-02-18 02:41:25 +02:00
Dax Dupont
221374e10b Reflectors now reset the range of a projectile like before! (#35726)
* Reflectors now reset the range of a projectile.

* how about dem apples
2018-02-17 14:17:11 -05:00
vuonojenmustaturska
ee370ada3f Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679)
* honk

* qdel memes
2018-02-16 01:39:59 -05:00
MMMiracles
faea718d06 Adds Cryostatis Shotgun Darts (#35342)
* adds cryostatis shotgun darts, because shooting tiny water+potassium bombs into people is funny

* lowers amount from 15 to 10

* Update ammo_casings.dm
2018-02-16 09:24:25 +13:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521)
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
2018-02-12 17:16:47 +02:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456)
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
2018-02-11 16:06:12 +13:00
Jordan Brown
f5ff686404 Merge pull request #35424 from ShizCalev/var-cleanup
Replaces some var values with defines
2018-02-10 12:10:40 -05:00
ShizCalev
f7fe600540 Cleans up vars with defines 2018-02-09 00:20:41 -05:00
kevinz000
b9de200c67 user dropping 2018-02-07 08:06:48 -08: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
MMMiracles
6c2db52ab3 Snowdin 2.0 (#35000)
* wrah wah wah waaaah

* fences, new mountain turfs, sprites, top-side finished, misc stuff

* quick fix

* cut my life into pieces, this is my last resort

* lots of work done to the underground segment, more fluff bits and topside work

* removing depreciated bits and tgm conversion

* step_off

* damn these dirty VARS

* changes n stuff

* wanna build a plasmaman?

* decals commit fix

* map detailing, loot spawns, plasma miners, cyberboss changes, plasma lava turning people into plasmamen

* tgm conversion

* new barricade sprites, final map edits before testing

* mountain wall fix

* Update snow_storm.dm

i ate too mucha pasta
2018-02-05 17:09:34 +02:00
kevinz000
26ad237862 Projectile hitscan refactor and visuals (#34363)
Moves beam rifle snowflake code up to projectile level for a proper hitscan system.

🆑
rscadd: Chameleon laser guns now have a special firing mode, activated by using them in hand! Only certain gun disguises will allow this to work!
/🆑
2018-01-30 09:23:51 +13:00