shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,146 Commits 5 Branches 0 Tags
c1a985d15418ec00a460560d878ea076c2a21ed0
Commit Graph

2930 Commits

Author SHA1 Message Date
Ghommie
2f3fd48b84 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-05-31 16:08:52 +02:00
Letter N
151df41d1c asset cache + better minimaps 2020-05-31 16:15:09 +08:00
kevinz000
2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
Letter N
af1aa9758d matrix and orbit thing (#12399) 2020-05-31 02:20:20 +02:00
Ghom
25dbed5b0b Made the decal component an element. (#12388) 
* Made the decal component an element.

* Is this really worth it?

* Oh.
 2020-05-30 14:06:53 -07:00
Ghommie
949e8f6b3a WIP 2020-05-30 21:53:14 +02:00
Ghommie
745695e60d WIP, js tiring. 2020-05-30 15:55:16 +02:00
L
4b19e5863e cooldown 2020-05-30 06:16:34 -03:00
kevinz000
65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -07:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
KathrinBailey
ff51c9d2db Improvised Weapons Update: Part 1 (#12226) 
* Improvised Weapons Part 1: Shotgun & Rifle

Adds new sprites for ammo, the improvised rifle, the improvised shotgun. Adds a hand saw. Adds things to the crafting menu. Adds things to the autolathe menu.

* PR not yet ready - just cleaning issues.

Just trying to remark some of the issues resolved so I can see where I'm at a bit easier.

* Reverting changes to shotgun ammo names in the autolathe.

No point calling it 12G when there's no 20G anymore.

* Weapon weight + sprite improvements.

Makes sprites for gun parts bulkier with a low alpha pixel outline to make them easier to click on. They also look a bit closer to what their final product will be.

* oops forgot the "

* Revert "Merge branch 'master' into Improvised-Part-1"

This reverts commit 1e43d228d1bc35b0582244ed0bd91934573b3cdd, reversing
changes made to 207e9fccd4e8cffbe9ed26401a6f516fc44245dd.

* Revert "Revert "Merge branch 'master' into Improvised-Part-1""

This reverts commit 22d421d010c4a4c5c5e26f49fe6bffcf6198df42.

* My Github or environment isn't flipping out. no more.

Derp. Also projectile damage modifier fixed. I can actually compile without hundreds of errors.

* Made small weapon parts have w_class small.

I was testing it out and seeing the trigger assembly take so much space in my inventory seemed really odd.

* Duplicate definition refused.

Hurrdurr I suck.
Glad I gave this a quick look-voer.
Shotgun description edited to reflect the 0.8x damage modifier.

* Resolved tools.dmi merge conflict.

Just took the dmi from master and put the new sprites on at the end.

* DNM - Trying to see why usptream tools.dmi with my stuff added on the end is conflicting.

* Please don't conflict
 2020-05-28 23:24:42 -07:00
kevinz000
03ee37bb06 let's finish parrying 2020-05-28 04:55:43 -07:00
Ghom
cea958f822 Fixing various issues. (#12368) 
* Fixing various issues.

* Lights.
 2020-05-28 00:36:57 -07:00
kevinz000
162e79df23 fixes dreamchecker errors 2020-05-27 18:17:00 -07:00
kevinz000
433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
Ghom
16dea7ceed Revamped the paper wizard robes. (#12348) 
* Better paper wizard robes.

* return value.

* ooo

* Aaa

* aaaa
 2020-05-27 18:01:22 -07:00
Ghom
968426fd48 Combat mode component. (#12338) 
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
 2020-05-27 18:00:32 -07:00
deathride58
93a168d8a8 updates dmapi from dmapi 5.1.0 to dmapi 5.2.1 (based off tgstation/tgstation#51100 ) (#12364) 2020-05-27 17:58:43 -07:00
Rohesie
d88c815845 vars (#12373) 2020-05-28 01:18:26 +02:00
Lin
1b8e05875f Merge pull request #12357 from Citadel-Station-13/Ghommie-patch-1 
quick tactical fix.
 2020-05-26 17:13:32 +00:00
Ghom
85186a9714 Porting updates related to material datums. (#12317) 
* Porting updates related to material datums.

* art_type

* oh oh
 2020-05-25 14:21:00 -07:00
Ghommie
d04d6ae9eb WIP 2020-05-25 15:06:31 +02:00
Ghom
8fd8b6a0bb Update tactical.dm 2020-05-25 11:16:51 +02:00
kevinz000
e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
Lin
ad57647e64 Merge pull request #12173 from kevinz000/projectiles_2 
Refactors projectile speed to pixels per second
 2020-05-24 21:21:41 +00:00
Ghom
ce1f1bdf5e Turning a few components into elements. (#12325) 
* Turning a few components into elements.

* eh
 2020-05-24 13:06:27 -07:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
kevinz000
e9068f05eb let's play the optimization game featuring lighting (#12310) 
* debug proc

* kinda quirky

* let's play the lighting game

* let's play the macro game

* let's play the refactor game

* let's play the optimization game

* let's play the optimization game x2

* yeehaw

* e

* let's play the memory game

* fix

* lighting fix

* sanitization and checks

* mh

* hotkeys fix

* ok
 2020-05-23 22:47:42 +02:00
Detective Google
d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-22 13:52:56 -05:00
Ghom
bcd911070a Fixing dwarfism. (#12331) 
* Update body.dm

* Update dwarves.dm
 2020-05-21 12:38:42 -07:00
Arturlang
8dd4fd4e66 Actually fixes mesmerize (#12330) 2020-05-21 21:26:05 +02:00
Ghom
8a0ed38a58 Fixing a few issues with the nutrition adjustment proc and the circuit printer. (#12320) 2020-05-21 10:10:59 -07:00
Ghom
e3922400a1 swift item action skills fix. (#12324) 
* Update _skill_holder.dm

* Update _skill_holder.dm

* Update _skill_holder.dm
 2020-05-21 10:09:54 -07:00
Ghom
3ac61c0704 Porting tg painting code. (#12305) 
* Porting tg painting code.

* yes.
 2020-05-20 18:45:36 -07:00
Ghom
6696560656 slendermen fix. (#12303) 
* slendermen fix.

* Whops

* Update dwarfism.dm
 2020-05-20 18:43:14 -07:00
Ghom
7f38e0714b Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302) 
* Skill calculation fixes, tweaks, antag and brain damage modifiers.

* Experience through patience.

* Priority Fix etcetera.
 2020-05-20 18:42:58 -07:00
zeroisthebiggay
55891e8d50 fixes ninja adrenals not being able to be activated when stamcritted because that is incredibly bad (#12312) 
* i fucking hate coding

* i fucking hate coding

* i fucking hate coding

* i fucking hate coding
 2020-05-20 18:07:29 +02:00
Ghom
ed90c59d65 Removal of """silk""" (#12221) 
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
 2020-05-19 23:43:46 -07:00
BlackMajor
fc921289d6 Merge pull request #12149 from kevinz000/DMAPI5 
Updates DMAPI to v5
 2020-05-19 22:32:17 +12:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268) 
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
 2020-05-18 04:46:57 -07:00
Ghom
75dec8ce2c Ports "Removes the absolute istype fest from footsteps" (#12259) 
* Ports "Removes the absolute istype fest from footsteps"

* Update species.dm
 2020-05-18 04:46:22 -07:00
Ghom
08280a853e Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282) 
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'

* Ok, signals.
 2020-05-17 17:04:15 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Seris02
35a35098bd fixed (#12278) 2020-05-17 00:50:28 +02:00
Ghom
31604812a9 Fixing gc issues with skill modifiers. (#12284) 2020-05-16 13:18:12 -07:00
Ghom
ab61713b50 Stores unused bad mood skill modifiers in a static list instead of deleting them everytime. (#12273) 
* Lowers gc subsystem cpu usage by caching mood skill modifiers.

* WHOPS.

* fug
 2020-05-16 13:16:01 -07:00
Ghom
73a27c8fe5 Porting "Fixes Null Reference + Qdel Issue in Runechat" (#12271) 2020-05-16 07:38:16 -07:00