Commit Graph

6438 Commits

Author SHA1 Message Date
Cheridan 7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs
Datum-Based Gangs [Ready]
2015-07-03 10:35:07 -05:00
Remie Richards 97cff6fc78 Specifies that the 3 value is for the Time argument of animate(), it was already, and did work, but due to animate() being ~funky~ it's kind of hard to read. 2015-07-03 11:50:36 +01:00
Swag McYolosteinen d7289fd34e Merge pull request #10254 from AlexanderUlanH/saltyseclites
Shadowling Update 2: 121% Merge-Ready
2015-07-03 10:55:32 +02:00
Incoming 20426cc18d Fixes the catastrophe: If human mutants aren't allowed in configs they don't have to be tested for roles
Additionally the game will properly read a null feature as racially pure.
2015-07-03 03:08:11 -04:00
GunHog 033650cc47 Cyborg headlamps!
- Borg lights are now a screen button.
- Removed all borg flashlight modules.
2015-07-03 01:38:29 -05:00
Razharas b1bf4d04fe Merge pull request #10209 from Ricotez/human_mutantparts
Gives humans two types of mutant accessories: ears and (human-specific) tails.
2015-07-03 08:36:36 +03:00
Razharas 572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
Ikarrus 8f8164d8e8 Removed atom var and instead used paramaters to determine the thrower 2015-07-02 19:57:51 -06:00
Ikarrus 91728513b6 Fixes clothes not protecting underlaying clothes.
It was because the |= operator couldn't be used to fetch the flags while the variable was null. It's set at 0 now.
2015-07-02 17:50:54 -06:00
xxalpha b563d5fbf4 Added ability for items inside items to have action buttons. 2015-07-03 00:33:02 +01:00
Ikarrus 2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00
Remie Richards 846d3e56c1 MINOR changes to the animation, it's now guaranteed to "smash down" into the victim, where as it was kind of random before (wtf byond?) it's also faster due maintain the same slam/smash effect. 2015-07-02 12:35:50 +01:00
Remie Richards d3e1521214 Changes the effect, the Weapon overlay now fades (to half transparency) and shifts it's pixel_z over the course of the animation. flick_overlay() now uses spawn() 2015-07-02 11:54:45 +01:00
Ikarrus 55bec2d24d Adds a thrownby var that's used by admin logging. 2015-07-01 13:00:12 -06:00
Remie Richards 4eba0b0802 Fixes SNPCs thinking a bullet attack was a melee attack (which obviously causes issues with this system) 2015-07-01 12:43:02 +01:00
Remie Richards 9f8a4be5a0 Combat now shows an overlay of the melee weapon used. it appears on screen for 5 ticks (1/2 a second) 2015-07-01 12:00:15 +01:00
Remie Richards cd36b1665b Merge pull request #10202 from nullstation/hi-extended
HTML interface module: Port of the crew monitoring computer
2015-07-01 05:59:39 +01:00
phil235 782fdd7678 Merge pull request #10259 from Razharas/DemonFix
Fixes dummy objects being rightclick visible
2015-06-30 23:04:30 +02:00
Ricotez acd297e7f5 -Added new option to the VV menu drop-down list: Toggle Purrbation.
-Putting a human on purrbation gives them cat ears and a cat tail, and sends them the message 'You suddenly feel valid.'
-Removing a human from purrbation reverses the effects, and sends them the message 'You suddenly don't feel valid anymore.'
-Renamed "Long and Smooth" tail to "Cat" tail. I wasn't kitten anyone with the old name.
-Updated changelog.
Forgot to include these two in the last commit:
-Cat ears and tail now use your hair colour instead of your mutant colour.
-Added changelog.
2015-06-30 20:17:55 +02:00
Cheridan 3fe48e2f26 Merge pull request #10248 from optimumtact/patch-6
log simple animal attacks to attack log
2015-06-29 23:03:12 -05:00
Cheridan 1368794705 Merge pull request #10112 from Ikarrus/whyamiinspace
Reactive Teleport Armor can teleport the user to space tiles again
2015-06-29 22:11:03 -05:00
Cheridan 87cd31c11f Merge pull request #10211 from Ikarrus/burntweaks
Destructible Clothing Tweaks and Fixes
2015-06-29 21:38:20 -05:00
Ikarrus 5792e7ccd9 - Swaps floor throwing and distance throwing
- Reagent containers thrown by bartenders will never spill if it doesn't collide into anything
2015-06-29 19:31:18 -06:00
Ricotez 3ea2eae81b -Removed roundstart access to ears and human tails. They are an admin only thing now.
-You can now set which colour an accessory should use: HAIR, FACEHAIR, EYECOLOR, MUTCOLORS or its own (0). Right now only mutantparts use this.
-Consequently, humans lost their ability to change mutant colours, although the special flag MUTCOLORS_PARTSONLY still exists.
2015-06-29 23:49:55 +02:00
Cheridan 3b4dbc4f27 Merge pull request #10216 from nukeop/syndiesurgerybag
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
Razharas f3f398feb9 Removes the autoclick, keeps the dark click 2015-06-29 23:17:16 +03:00
Razharas 1b793f89c8 Merge branch 'master' of https://github.com/tgstation/-tg-station into DarkClick
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/client/client defines.dm

Fixes conflicts
2015-06-29 23:15:06 +03:00
Ricotez 44b795138c -Adds new proc-based job check for species. If enforce_human_authority is set, the various pieces of code that deal with roundstart job stuff will call this proc on your preferred species with 2 arguments: the name of the job and the list of mutantparts you have currently set.
-The proc is defined as proc/qualifies_for_rank(var/rank, var/list/features), and by default defined to always return 1. You must override it locally in your species definition to set special job properties.
-Lizards will fail the check for jobs in command_positions and pass it for any other job. Just like before.
-Humans will always pass the check if they don't have ears or tails. If they do have ears or tails, they will fail the check if the job is in command_positions, engineering_positions, science_positions, medical_positions, security_positions or equal to "Quartermaster", effectively limiting their job selection to civlian, lower supply and silicon jobs.
2015-06-29 22:13:25 +02:00
Razharas 8a26ff2527 Fixes dummy objects being rightclick visible
Fixes dummy objects being rightclick visible
2015-06-29 15:38:39 +03:00
Razharas 182e11430d Fixes chameleon mutation
Fixes chameleon mutation
2015-06-29 14:21:06 +03:00
Alexander P. Ulan Hernandez ebc6041f9f Comitterydoo
Adds Xhuis' second shadowling fix, along with a slight rework and
expansion of the veil spell.
2015-06-29 03:58:03 -04:00
Jordie f0d4dda9e1 Merge pull request #10218 from optimumtact/patch-3
Jetpack speed changes
2015-06-29 15:01:53 +10:00
Ikarrus 8c1fde7947 Squashed Commits 2015-06-28 22:38:55 -06:00
Orange Borg 77a77dd107 Jetpack speed changes [DNM]
being in zero grav now gives a -1 speedup (as if you had gottagofast)
being in zero grav with a jetpack gives -2 (gottagoreallyfast)

The gottagofast and gottagoreallyfast flags only apply in gravity situations now
2015-06-29 15:30:55 +12:00
Orange Borg efcd5f3f75 log simple animal attacks to attack log 2015-06-29 15:24:34 +12:00
Ikarrus 4dbb5feb2d If ex_act(2) is softened by armor, shredding chance gets halved 2015-06-28 20:29:13 -06:00
Ikarrus 4f4b8f1774 Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2015-06-28 19:00:16 -06:00
Ikarrus 48dedda36b ABSTRACT items cannot be shredded 2015-06-28 18:55:34 -06:00
Ikarrus 454348759d Workplace "Accidents"
- Slipping while carrying items in your hand may cause ~accidents~
  - 30% chance to attack yourself
  - 30% chance to attack the floor
  - 30% chance to throw the item towards the direction you're facing
- Throwing reagent containers such as drinks or beakers may spill their contents onto whatever they hit
2015-06-28 18:19:11 -06:00
Cheridan 6c0a930cfb Merge pull request #10173 from Incoming5643/coding_stupid_shit_is_my_antidrug
Rainbow slimes finally obtainable
2015-06-28 18:01:30 -05:00
nullquery 6453882e37 Merge pull request #10 from nullstation/master
Merge with upstream
2015-06-28 23:03:23 +02:00
NullQuery c694febb77 Minimap support for the crew monitoring computer. 2015-06-28 23:00:39 +02:00
Ikarrus d07e315ddf Squashed 2015-06-28 12:11:05 -06:00
phil235 e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
barackobama 7dfcc292b7 add a variable to mmi to indicate if it's of the syndicate variety as
suggested
2015-06-28 12:44:25 +01:00
AnturK 5dbd55561d Adds eating corpses/items. 2015-06-28 11:40:36 +02:00
MMMiracles dcdd122f47 Adds europoor and cyka bylat (WIP) apparel to appeal to the inferior masses. assblastusa. 2015-06-28 05:11:32 -04:00
MMMiracles 9097c25cb9 Adds patriotic apparel for upcoming 4th of July. ASSBLASTUSAUSAUSA. 2015-06-28 03:09:55 -04:00
nullquery a6ce6abfe3 Merge pull request #8 from nullstation/master
Merge with upstream
2015-06-28 07:09:40 +02:00
barackobama 0316a836cb add a Syndicate surgery dufflebag full of tools to the uplink
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00