shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,063 Commits 5 Branches 0 Tags
1bca74465f9ce76e207d20a91e43a5e7c3cba3f6
Commit Graph

14695 Commits

Author SHA1 Message Date
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
Ghom
668205c149 Unstucks robot mobs from permanent sprint mode. (#12389) 2020-05-29 14:56:19 -07: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
DeltaFire15
ddca75997b Skewers no longer cause deadchat spam (#12376) 
* removes deadchat spam

Yikes

* Ghom's requested change

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-28 15:48:01 +02:00
TheFakeElon
9d169fc43e Adds unum (#12369) 
* unoo

* bracket

* COMMA

* Update toys.dm

* fixes icons

* Update code/game/objects/items/toys.dm

Thanks ghommie

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* pool noodle and viro

* removes dupes

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-28 15:47:44 +02:00
Rohesie
2857a13933 nested (#12381) 2020-05-28 14:12:58 +02:00
Putnam3145
811b801569 fixes ghost role eligibility delay (#12379) 2020-05-28 14:11:42 +02:00
Ghom
cea958f822 Fixing various issues. (#12368) 
* Fixing various issues.

* Lights.
 2020-05-28 00:36:57 -07:00
Putnam3145
8e945bca4d Made restoring roundstart air restore the archive too (#12367) 2020-05-28 00:36:51 -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
54bd506184 Merge pull request #12361 from Ghommie/Ghommie-cit794 
Fixing some blindness stuff and visible messages.
 2020-05-27 22:39:55 +00:00
kevinz000
9ca40290a3 Update _network_builder.dm (#12370) 2020-05-27 22:19:16 +02:00
Ghom
c877358340 Removes the immutable bit from the mining inquisitor/berserk hardsuits' slowdown. 2020-05-26 15:27:34 +02:00
kevinz000
0bfe77e15a ok (#12365) 2020-05-26 15:24:23 +02: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
Ghom
e11908a357 Oranges and Paperwork can be picked up again. (#12351) 2020-05-25 14:20:10 -07:00
Ghommie
841bb86181 Fixing blindness stuff. 2020-05-25 16:10:25 +02: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
a41a06bc4b Fixing beam rifles lacking pin and pacifism checks. (#12349) 2020-05-24 13:29:45 -07:00
Ghom
07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00
Ghom
0a6b755eff Apotechary chem dispenser nerf. (#12292) 
* Apotechary chem dispenser nerf.

* Spelling and build_path.
 2020-05-24 13:20:32 -07:00
Ghom
c8cd97351d Makes gun weight akimbo restrictions work the other way around. (#12297) 
* Makes gun weight akimbo restrictions work the other way around.

* web edits
 2020-05-24 13:19:28 -07:00
Ghom
9fef1b62e1 Removing duplicate total item attack force modifiers. (#12342) 2020-05-24 13:12:44 -07:00
Arturlang
32135cc008 Makes bloodsuckers unguttable and undecappable (#12335) 
* Bloodsuckers cant be gutted or beheaded anymore

* Mistakes were made
 2020-05-24 13:08:18 -07:00
Arturlang
4fcb0451a1 Makes bloodsuckers unable to suck through thick clothing (#12334) 
* Cant suck through hardsuits now can you

* Lets join in passive suck as well

* Bug fixings
 2020-05-24 13:08:06 -07:00
Ghom
6756b564b7 Removing that one keg. (#12333) 2020-05-24 13:07:53 -07:00
Ghom
ba3151bf1e Pills and pill bottles are now volumetric. (#12332) 2020-05-24 13:07:35 -07: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
Lin
a6d7170d5b Merge pull request #12313 from kevinz000/click_logs 
[s]click logging
 2020-05-23 20:21:45 +00:00
Lin
c857dc9cd1 Merge pull request #12321 from Ghommie/Ghommie-cit779 
Makes fermichem properly logged in the reagents logs, tiny astrogen fix.
 2020-05-22 21:36:00 +00:00
Ghom
bcd911070a Fixing dwarfism. (#12331) 
* Update body.dm

* Update dwarves.dm
 2020-05-21 12:38:42 -07:00
Lin
4ee5d0cb37 Merge pull request #12296 from kevinz000/paracoat 
Adds a paramedic wintercoat
 2020-05-21 19:26:31 +00:00
Arturlang
8dd4fd4e66 Actually fixes mesmerize (#12330) 2020-05-21 21:26:05 +02:00
Lin
8ca1bcd237 Merge pull request #12315 from DeltaFire15/styp-silsulf-OD-fix 
Fixes Styptic Powder & SilverSulf OD effects
 2020-05-21 19:22:28 +00: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
kevinz000
e792600115 Update movement.dm (#12327) 2020-05-21 15:00:21 +02:00
Funce
0fbbd51418 Add the pie-cannon sound to the circuit version of the pneumatic cannon (#12319) 2020-05-21 14:55:25 +02:00
Trilbyspaceclone
fcb2b58664 Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112) 
* Misstake are now

* Still dosnt all work

* no more range upgrade it just dosnt work

* bithell

* a this
 2020-05-20 19:03:20 -07:00
Trilbyspaceclone
7337993d8e Lavaland Gear Tweaks - Armor balancing (#12270) 
* lava land tweaks

* Reverts Exo suit touches

5% isnt worth that much, so might as well give it back

* Update miscellaneous.dm

* Reverts the ERT based gear
 2020-05-20 18:47:30 -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
Kraseo
a7053a978f Ports a tail from the RP server (#12301) 
* tailse

* forgot to reorder it lol

* and i guess felinids and anthros can use it too
 2020-05-20 18:37:38 -07:00
Ghommie
50171db408 Makes fermichem properly logged in the reagents logs, tiny astrogen fix. 2020-05-21 03:04:26 +02:00