Commit Graph

6573 Commits

Author SHA1 Message Date
Spades
9b8cc501bd Merge pull request #1955 from Verkister/blehh2sparkbooger
Another small saddlebag fix.
2017-08-09 00:54:01 -04:00
Verkister
c72893c0f7 Noticed a case thing and i ain't taking chances this late.
-I'm already asleep it's not even me typing this shit right now.
2017-08-09 02:19:17 +03:00
Verkister
1b3732f11f Another small saddlebag fix.
-Figured out why saddlebags weren't showing up on subtype taurs.
-Something something spaghrtti and now the iconstate sets accordingly to the main type name instead of subtype name.
-I really need to sleep this is my last second awake tonight and hopefully this works?
2017-08-09 02:12:12 +03:00
JOAN-RIG\Joan Risu
02e8dc62bd Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-08-08 14:56:29 -07:00
killer653
8e42ab0ca1 Merge remote-tracking branch 'PolarisSS13/master' into POL_SYNC 2017-08-08 16:10:47 -04:00
Cameron653
ca4f0f2523 Update surgery_tools.dm 2017-08-08 14:00:30 -04:00
Spades
1ef09a64d1 Removes SVD 2017-08-08 01:17:29 -04:00
Spades
7db8de3530 MERGE 2017-08-07 16:55:50 -04:00
Cyantime
c5594c31e5 alters trash pile loot pool 2017-08-06 04:18:26 -04:00
Neerti
a36313659e Removes Cloaking
Removes cloaking from the red crowbar, due to an incorrect icon var.
2017-08-05 19:46:36 -04:00
Anewbe
1a7d47fc6b Merge pull request #3676 from Neerti/8/3/2017_tool_update
Updates Tools
2017-08-04 14:05:06 -05:00
Neerti
4256ec902a Changes path of alien tools, adds hacking sounds, and makes the fireaxe cabinet use toolspeed. 2017-08-04 08:35:16 -04:00
Neerti
99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
Cyantime
68c053212c Disables phasing downward through catwalks 2017-08-02 22:29:42 -04:00
Neerti
b2f5b758f1 Hopefully fixes merge conflicts. 2017-08-01 16:18:43 -04:00
Neerti
36b0f5fa99 Even More Circuit Changes
See PR for changes.
2017-08-01 16:13:27 -04:00
Anewbe
1888d10b23 Merge pull request #3663 from Nalarac/Robot
Modifies Illegal Equipment Module
2017-07-31 13:28:36 -05:00
Andrew
09f0ca8c81 Fixes description of upgrade
adds of
2017-07-30 15:48:30 -05:00
Andrew
36e4adaf8f Modifies Illegal Equipment Module
+Illegal equipment module now scrambled equipment module
+Scrambled equipment module now unlocks emagged borg items without
actually emagging the borg, allowing for AI sync, law updates, and being
emagged.
+Makes the miner borg diamond drill appear in all cases of being
upgraded or emagged instead of only if emagged while the mining module
is equipped.

Changelog includes all my previous PRs as well for ease of access to the
changes by the general public. I can trim it down to just this PR if
requested.
2017-07-29 17:32:33 -05:00
silveryferret
786c21c66e Fixes build_path variable, tweaks required components for R-UST parts, adds supply packs for R-UST things 2017-07-29 05:26:07 -04:00
LorenLuke
31e90bfeed Adds Collapsible AM rifle. Createes new uplink entry (#3644)
* Adds Collapsible AM rifle, and adds case with parts and 5 shots to Uplink. Separates it and intended merc version, both costing default telecrystal amount. Does NOT make them antagonist type specific.

* Addresses review.

* Makes rifle case traitor/merc specific. Enables ability to have specific uplink items be available only for specific antags.
2017-07-28 16:06:20 -05:00
HawkerTheGreat
7695e45e3a Path Fix
Last Issue, I swear to god, I will get sleep tonight.
2017-07-26 03:56:48 -05:00
HawkerTheGreat
a52af2947e Vox Phoron Tank Sprites Suddenly Missing 2017-07-26 03:33:02 -05:00
Anewbe
31bc1f757f Merge pull request #3635 from LorenLuke/Bomb-Consistency
Tank/TTV Consistency improvement
2017-07-25 16:44:45 -05:00
LorenLuke
3a80ffa080 Fixes inconsistent behavior by TTVs and STBs. 2017-07-24 10:28:20 -07:00
Anewbe
a5114f99dd Embiggens the laundry baskets 2017-07-23 16:33:02 -05:00
Anewbe
196212faee Merge pull request #3614 from silveryferret/Polaris-R-UST-Port
R-UST Port, now in Polaris flavor.
2017-07-23 11:25:24 -05:00
Anewbe
91b06c20d1 Merge pull request #3622 from LorenLuke/tank-runtime-fix
Fixes a div/0.
2017-07-23 00:25:35 -05:00
LorenLuke
bc972c86e8 Fixes a div/0. 2017-07-22 22:05:45 -07:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04:00
silveryferret
7567726c07 Ports R-UST from Baystation12 + small admin debug verb 2017-07-19 20:33:16 -04:00
Cyantime
875ab81824 Adds object-specific effects for running into them while confused (#1879)
* Adds object-specific effects for running into them while confused.

* How do comments work, we just don't know

* WHAT EVEN ARE COMMENTS
2017-07-19 15:54:41 -04:00
Cyantime
3f48e8ae07 Attempted wilderness performance increase (#1841)
* Attempted wilderness performance increase

* might as well

* Edit comments

* Moves alien change out of polaris file
2017-07-19 15:30:22 -04:00
Cameron653
97e851f2e4 Adds in body snatcher device (#1822)
* Adds in body snatcher

* Modifies method the bodysnatcher works

* Fixes merge & compile error

* Update trash_pile.dm

* Update trash_pile.dm

* Gets transfer_to to work
2017-07-19 15:26:34 -04:00
Anewbe
7669c83dfa Merge pull request #3607 from LorenLuke/one-tank-bomb
Changes Single-Tank-Bomb behavior.
2017-07-19 14:01:36 -05:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Anewbe
d7875f5377 Merge pull request #3609 from Belsima/legwarmers
Adds a load of zippos to the loadout.
2017-07-18 16:27:09 -05:00
Anewbe
b22a9fa575 Merge pull request #3589 from Belsima/gloves
Adds fingerless gloves.
2017-07-17 15:42:28 -05:00
Belsima
a291ae9889 Adds a load of zippos to the loadout. 2017-07-17 14:57:14 -04:00
LorenLuke
b7f5362276 See https://github.com/Baystation12/Baystation12/pull/14404.
(ignore point 13)
2017-07-16 16:03:31 -07:00
PrismaticGynoid
ad6e395ae2 Replaces intelliCards with intelliCores.
Sprites replaced with a black box that could conceivably contain a brain, while obscuring the details. Complete with screen and convenient handle.
Usage text modified to make sense for MMIs/posibrains, instead of just drone brains (e.g. downloaded → transferred).
Description added to the new intelliCores. Made into normal-sized item, similar to MMIs/posibrains.

This is an alternative to either changing lore to allow for brain uploading, or changing code to allow for choosing multiple AI brain types.
2017-07-13 00:14:34 -07:00
Belsima
e51de25dea Adds fingerless gloves. 2017-07-11 00:49:02 -04:00
Neerti
a47584fdb0 Merge pull request #3576 from Anewbe/medical_gowns
Adds medical gowns
2017-07-10 17:48:31 -04:00
Anewbe
c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat
Winter boots
2017-07-09 17:13:27 -05:00
Anewbe
be8c644e07 Merge pull request #3565 from Neerti/7/6/2017_jammers
Adds Radio Jammers to Traitor Uplink
2017-07-09 16:15:42 -05:00
Anewbe
252f3af8ad Adds medical gowns 2017-07-09 15:03:11 -05:00
Anewbe
c1da073906 Merge pull request #3571 from SpadesNeil/tree-layer-fix
Fixes layering issue with tree icons
2017-07-09 14:06:46 -05:00
Spades
5672fbe648 Merge pull request #1839 from VOREStation/tether-changes
Tether changes
2017-07-08 23:13:22 -04:00
Anewbe
cf09e7f55c Merge pull request #3570 from Belsima/master
Enables unused cypherkey sprites.
2017-07-08 14:48:02 -05:00
Anewbe
128358e153 Merge pull request #3567 from Neerti/7/7/2017_communicator_ghost_sound
Communicator Ghost Message Sounds
2017-07-08 14:45:56 -05:00