Commit Graph

451 Commits

Author SHA1 Message Date
nik707
b76bb57609 Merge pull request #7734 from deathride58/fancylightingwave2
Fancy lighting wave 2 - nonbinary colored lighting now applies to gun/helmet flashlights, borgs, bots, welders, and more
2018-11-19 18:05:27 -06:00
deathride58
e0cdd8fb93 Merge pull request #7678 from Trilbyspaceclone/patch-5
[Ready] Nerfs reactive armor a bit.
2018-11-18 07:42:42 -05:00
deathride58
29bdaf3011 Merge pull request #7710 from Trilbyspaceclone/patch-8
[Grammar] [Ready] Makes Space Queens men pirate gear have better item descriptions
2018-11-18 07:39:14 -05:00
Trilbyspaceclone
5feebdc7d3 "Better Grammar or something" 2018-11-18 06:10:23 -05:00
deathride58
621b0675e9 Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights 2018-11-16 21:12:07 -05:00
Trilbyspaceclone
6694add91e ''honorable'' 2018-11-10 12:43:20 -05:00
Trilbyspaceclone
95b7ecfe39 Better item descriptions 2018-11-10 12:36:21 -05:00
Poojawa
f03cd4c852 Actually test-fixed taur suits this time 2018-11-10 00:23:42 -06:00
Trilbyspaceclone
462891a68b STEALTH 2018-10-30 18:51:22 -04:00
Trilbyspaceclone
c10602689e "Middle grounds" 2018-10-28 02:19:48 -04:00
Trilbyspaceclone
f4f33042e2 Makes kev more happy!
Feels like hugbox power creep to me
2018-10-28 01:56:22 -04:00
Trilbyspaceclone
3bd12750db 75 + 10 +50 = 135 block... 120 is two riot shields 2018-10-28 01:14:04 -04:00
Poojawa
42b1d03d2a [READY] Tauric full body suits (#7639)
* let's get this back on the table

* split 'em up because sorting memes

* Gets stuff code-ready, sprite work to continue

Engineering / Atmosia / Cheng
Civilian Space
Blood Red / Red and Black
Riot / Armor vests
Radiation / Fire / Atmosia Fire
Bio Suits (Viro/CMO/basic)
ERT / Deathsquad

* It's messy, but it works so w/e

* let there be more tail access

* finishes naga taur spriting

* memes

* super fixes any lingering memes

* leg experiment

* nah, this isn't gunna work.

* poked at canine again

* saving memes

* tweaks some fixes and things

* finished quad suits, added bomb suits for nagas also

* "inconsistant indentation" Byond you fuck

* Take that, byond

* The war on Byond continues

* let's make sure the explorer gear uses fancy sprites

* syndiE ??? wtf did I sleep type
2018-10-18 09:30:37 -07:00
Poojawa
91620218e4 some cherrypicked TG fixes and tweaks 2018-10-12 05:37:36 -05:00
Poojawa
8bcfeff15d Fixes bloody shoes effect 2018-10-09 18:02:02 -05:00
deathride58
ab4eae403a Merge pull request #7632 from Poojawa/Digitigrade-suits
Digitigrade suits
2018-10-08 18:49:12 -04:00
Poojawa
aa8d29fc53 Ensures suit.dm bandits are exempted 2018-10-07 05:36:56 -05:00
Poojawa
a05acf5c7e Finishes sprites, ensures proper equipping
Also blacklists customs that aren't in suit.dmi yet
2018-10-07 04:56:22 -05:00
deathride58
f3e166a8c7 Merge pull request #7614 from Poojawa/patch-1
Fixes Black Tango dress for digitigrade
2018-10-06 19:23:44 -04:00
Poojawa
756f853492 Digitigrade suits base line
All suits have N/S at this point, some have E/W. god this is going to be awful.
2018-10-06 04:43:07 -05:00
Poojawa
636f3e7d21 black_tang_l 2018-10-04 21:57:06 -05:00
Poojawa
7825905a82 Probably fixes some dress oddities 2018-10-03 15:16:27 -05:00
deathride58
0ce450eab8 tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory 2018-10-02 19:36:21 -04:00
Poojawa
729790f9d3 Overhauls some code, double checks uniforms 2018-09-28 03:54:57 -05:00
Poojawa
e4cdb0c853 Merge branch 'master' into override-override 2018-09-28 01:49:35 -05:00
Poojawa
70d969c5cf Enables Digitigrade jumpsuit wearing 2018-09-27 05:08:39 -05:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
Poojawa
5982f5c67c Ensures Shoes are updated 2018-09-26 08:59:48 -05:00
Poojawa
865b6a5b3a Finished code 2018-09-26 08:59:48 -05:00
Poojawa
a4810b6666 some code before I ran out of time at work 2018-09-26 08:59:48 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa
afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000
f694924573 Update _glasses.dm 2018-09-05 06:47:23 -07:00
Poojawa
4be05e412e Fixes Fedoras having armor values (#7521) 2018-08-31 12:13:50 -07:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
AnturK
18dd26ee3a Adds missing armor to accessories (#38800) 2018-07-01 05:41:32 -05:00
Jordan Brown
1ee84bb7d2 Merge pull request #38580 from Hyacinth-OR/pinkscarf
Adds a pink scarf
2018-06-19 09:49:28 -05:00
deathride58
7150c207aa Fixes a merge conflict 2018-06-19 07:30:52 -04:00
CitadelStationBot
db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
oranges
997d85329c Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes
Give plasmamen their plasma suits in VR
2018-06-11 22:29:43 -05:00
ShizCalev
18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05:00
CitadelStationBot
1bf74841c7 [MIRROR] Removes reactive incendiary armor from non-admin methods of obtaining (#7050)
* Make incendiary armor aspawn only (#38370)

* Removes reactive incendiary armor from non-admin methods of obtaining
2018-06-10 12:30:57 -07:00
Kraseo
cf8436cf6d a slippery slope into h*ck (#38303) 2018-06-07 20:00:36 -05:00
ShizCalev
67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay
5fff5e3968 Merge pull request #6918 from Citadel-Station-13/upstream-merge-38003
[MIRROR] Gun overlays 2: Electric boogaloo.
2018-05-27 14:41:57 -05:00
Dax Dupont
74932ddce0 Gun overlays 2: Electric boogaloo. (#38003)
* Reduces selfcharge gun processing/icon work

* More efficient gun overlays, adds old_ratio var

* oh my god it was calling the egun's update_icon?

* percent proc

* Attachment overlay overhaul

* Cut overlays in egun update

* ebow 1000% better overlay management

* Update gun.dm

* Pointless check

* Giving KA and children consistent icon behavior

* Update kinetic_accelerator.dm

* Fixed

* ..() readded

* ..() readded

* ..() readded

* Antur didnt catch this one heck

* Because confusing vars are apparently more maintainable

* Gun overlays 2: Electric boogaloo

* another one

* Chameleon guns are removed

* tentacles everywhere
2018-05-27 11:41:14 -05:00
GuyonBroadway
0082b0f2c0 Ports gloves of the north star from Hippie (#37864)
* Ports gloves of the north star from Hippie

* Doing a white line

* adds customiseable warcry and sprites by Notamaniac

* star with a capital S

* Nitpick grammar
2018-05-27 11:40:47 -05:00