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

34209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trilbyspaceclone 6db076c42f Lowers the slowdown on snow tiles (#12404) 
* Update fancy_floor.dm

* Update fancy_floor.dm
 2020-06-04 15:52:30 -07:00
EmeraldSundisk 1d990d317e Minimally invasive update to Omega Station. (#12434) 
* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Add files via upload
 2020-06-04 15:44:12 -07:00
DeltaFire15 0dc57a5a96 Powers Reimagined : Void Volt (#12433) 
* Void volt try 2 : Conflict boogaloo

This time with a new branch because >conflicts

* changes up some stuff

some modifications & fixes for void volt while also reorginasing the scripture tier scriptures a bit.

* Tweaks, fixes and changes

After a fuckton of localtesting, I changed around some values / fixed some stuff so it should be fine to have.

* haha yeah uh better not leave that one debug message in

oops!
 2020-06-04 15:41:01 -07:00
deathride58 3eb3934e26 Adds Pride Month as a holiday! (#12436) 
* Adds pride month as a holiday, complete with assistants spawning with rainbow jumpsuits

* yknow what, while i'm at it, let's compress it
 2020-06-04 15:40:31 -07:00
Ghom 76da796b76 Merge pull request #12441 from DeltaFire15/addiction-and-switch-torture 
Fixes addictions.
 2020-06-04 19:38:24 +02:00
DeltaFire 1a6bfeb0f1 Switch man bad 
ifs in switch segments ONLY support constant expressions, NOT vars
 2020-06-04 18:32:41 +02:00
Lin 5e37d3ef3b Merge pull request #12430 from Ghommie/Ghommie-cit811 
Fixing various icons problems with some clothings.
 2020-06-03 20:23:16 +00:00
Lin 837d011695 Merge pull request #12426 from Ghommie/Ghommie-cit810 
The BEPIS reward disk icon state I forgot to add.
 2020-06-03 20:21:22 +00:00
Ghom d53dca7322 Fixing just a couple issues. (#12417) 2020-06-02 15:30:22 -07:00
Trilbyspaceclone f926dd7f5e Update pockets.dm (#12421) 2020-06-02 15:29:51 -07:00
Ghom 575609ca8a Fixing my fix for reclyclers. (#12422) 
* Fixing my bad fix for the recycler.

* rework.

* Ok
 2020-06-02 15:29:32 -07:00
ynot01 ab3799ae7a Ports cornrows hairstyles from yogstation (#12423) 2020-06-02 15:29:07 -07:00
Ghom d7954ca077 Yet another PR fixing some issues. (#12424) 2020-06-02 15:29:01 -07:00
TheObserver-sys 0d55a387d0 Powers Remembered: Chants (#12403) 
* Initial Commit: Inath-Neq's Mantra

* A Volt of Inspiration

* Bug Squash I

* Bugsquashing II

* Bugsquashing III - Now with effects added!

* Bugsquashing IV: This probably won't work!

* It worked, how about that. Numbers Tweak.

* Better Number Tweaks

Co-authored-by: The0bserver <Gizmomaster777@gmail.com>
 2020-06-02 15:27:13 -07:00
Ghom 07e42c079c Fixing cards states and user-less projectiles checking mean armor values. (#12400) 2020-06-02 15:24:13 -07:00
Ghom ea763df326 Photosynthesis element. (#12394) 
* Photosynthesis element.

* element yaketi sax.

* Ok, let's just use SSobj which has 20 wait instead of 10.
 2020-06-02 15:23:09 -07:00
Ghom a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347) 
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
 2020-06-02 15:22:06 -07:00
Ghom 0d7d2071ec Merge pull request #12232 from Trilbyspaceclone/patch-379 
Makes seed points take into acount more varables so that you can get more points!
 2020-06-02 23:50:14 +02:00
Ghom 1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2 
Adds a New map, Snow Taxi (A vgstation13 map port)
 2020-06-02 23:48:50 +02:00
Ghom 26f90b5fcf Merge pull request #12429 from coldud13/altclick_grinder+biogen 
Alt-click to remove containers from reagent grinder / biogen
 2020-06-02 23:39:22 +02:00
Ghom 6b70215b35 A tiny paperwork update for CogStation. (#12418) 
* Update CogStation.dmm

* Add files via upload
 2020-06-02 23:38:21 +02:00
Trilbyspaceclone 916a1ab349 Update objective_items.dm (#12420) 2020-06-02 23:37:05 +02:00
Ghommie 1a9484cf2e Fixing missing clothing icons etc. 2020-06-02 17:43:31 +02:00
coldud13 17d4c99b25 alt click to remove containers from reagent grinder and biogenerator 2020-06-02 19:10:41 +10:00
coldud13 9fda4052b4 Merge remote-tracking branch 'origin/master' 2020-06-02 18:46:45 +10:00
Ghommie 32e93f9dce The BEPIS reward disk icon state I forgot to add. 2020-06-02 02:51:41 +02:00
Arturlang 597432424c Buffs lunging gloves a bit, so they arent a detriment to the user as much (#12336) 
* Buffs leap all around

* Kev suggestions

* Im stoopid
 2020-06-01 21:51:41 +02:00
kevinz000 effa47ec93 Update projectile.dm (#12380) 2020-06-01 21:46:02 +02:00
EmeraldSundisk 2ac1ada029 Add files via upload 2020-05-31 19:52:00 -07:00
Lin fef5e0bc56 Merge pull request #12408 from Ghommie/Ghommie-cit804 
Fixing missing hypnochair states.
 2020-06-01 01:22:56 +00:00
Lin e80cee9b4c Merge pull request #12406 from Citadel-Station-13/Ghommie-patch-1 
Fixing holodeck bedsheet magic in a better fashion.
 2020-06-01 01:21:20 +00:00
Yawet330 8e26876634 Makes Spears rational. (#12401) 
* hate spears, hate elances, hate embedding.

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

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

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

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

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

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

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-06-01 01:44:31 +02:00
Letter N 1fc73700c5 Telecomms TGUI (#12145) 
* aaaaaa

* branch hell

* time to sync

* build

* adds more """functionality""" for telemonitor

* messaging pda thing

* bakes tgui

* someone didn't finish the code for req. consoles

* go use [TELECOMM STUFF].on, it's better

* build stuff

* a

* interface for teleinteraction

* tgui

* ready for launch - not tested yet

* build

* built ui

* bitflag readability and bye oldcode!

* bepis

* build ui
 2020-06-01 00:22:40 +02:00
Lin 348885a58d Merge pull request #12382 from Ghommie/Ghommie-cit797 
Slight simple mob boss improvements.
 2020-05-31 15:22:23 +00:00
Sonic121x b7411bf9a0 Fix The X-01 Multiphase energy gun box (#12409) 
Fix /obj/item/storage/secure/briefcase/hos/multiphase_box/PopulateContents()
 2020-05-31 13:50:31 +02:00
Ghom 48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392) 
* chemistry bag nerf and little pill volumetric tweak.

* Yea, sure why not?

* hey.

* Kevinz review.
 2020-05-31 00:54:28 -07:00
Ghommie 00e609e747 Fixing missing hypnochair states. 2020-05-31 03:18:11 +02:00
Letter N af1aa9758d matrix and orbit thing (#12399) 2020-05-31 02:20:20 +02:00
Ghom bfd23bec04 That won't help us. 2020-05-31 01:50:17 +02:00
Ghom effd1b0158 Fixing bedsheet magic in a better fashion. 2020-05-31 01:46:16 +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
Ghom f572fe4607 Revert "Framework for (hopefully) reducing memory usage by replacing thousands of decals with turfs that look visually identical (#12383)" (#12387) 
This reverts commit ab86d669a7.
 2020-05-30 14:06:38 -07:00
Putnam3145 266707b119 Readded feeding to simplemobs (#12378) 2020-05-29 20:01:51 -07:00
Rohesie 5ab8d41d9a horns (#12384) 2020-05-30 03:25:27 +02:00
Arturlang d7dc6bb57c Makes bloodsuckers not get fat (#12391) 2020-05-30 03:24:46 +02:00
Chayse Ramsay f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155) 
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
 2020-05-30 03:17:56 +02:00
Changelogs 5a0c987572 Automatic changelog compile [ci skip] 2020-05-30 00:19:00 +00:00
Changelogs bb4c92ca66 Automatic changelog compile [ci skip] 2020-05-30 00:07:14 +00:00
Ghom 668205c149 Unstucks robot mobs from permanent sprint mode. (#12389) 2020-05-29 14:56:19 -07:00
KathrinBailey ab86d669a7 Framework for (hopefully) reducing memory usage by replacing thousands of decals with turfs that look visually identical (#12383) 
* yeah don't worry trilby I have the 'sprites'

* conflict
 2020-05-28 23:30:34 -07:00