cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,299 Commits 55 Branches 0 Tags
1a9787a9c23b951cae21c16e1f8601edb25f7bad
Commit Graph

22554 Commits

Author SHA1 Message Date
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07: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
Trilbyspaceclone
916a1ab349 Update objective_items.dm (#12420) 2020-06-02 23:37:05 +02:00
coldud13
17d4c99b25 alt click to remove containers from reagent grinder and biogenerator 2020-06-02 19:10:41 +10: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
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
kevinz000
abc2b820a4 Update living_blocking_parrying.dm 2020-05-30 23:49:04 -07:00
kevinz000
faf65ae2b5 Merge branch 'combat_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into combat_rework 2020-05-30 23:46:34 -07:00
kevinz000
5b6e797c4f desword adjustments 2020-05-30 23:43:05 -07:00
kevinz000
250d078596 that was easy 2020-05-30 23:14:02 -07:00
kevinz000
34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000
d832cb6526 fix 2020-05-30 22:43:23 -07:00
kevinz000
2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
kevinz000
1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00
kevinz000
c613726c2a render 2020-05-30 22:05:19 -07:00
kevinz000
e6020ca22c variable render 2020-05-30 21:02:13 -07:00
kevinz000
0723399ed4 render 2020-05-30 20:55:33 -07:00
kevinz000
d47841ee54 documentation 2020-05-30 20:38:07 -07:00
kevinz000
588443e928 fix 2020-05-30 20:12:50 -07:00
kevinz000
e5c32c1746 changes 2020-05-30 20:11:18 -07:00
kevinz000
502873cb7c Delete bindings_living.dm 2020-05-30 18:19:39 -07:00
kevinz000
4a971a223c Delete bindings_mob.dm 2020-05-30 18:19:04 -07: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
kevinz000
9d4d6e6b6f your goddamn ass isn't a constant expression 2020-05-30 02:12:49 -07:00
kevinz000
3251338d31 fix 2020-05-30 02:01:06 -07:00
kevinz000
519552cb78 more handling 2020-05-30 01:59:58 -07:00
kevinz000
1214c99a34 is this a good idea 2020-05-30 01:46:43 -07:00
kevinz000
b74d465b6c fix 2020-05-30 01:22:09 -07:00
kevinz000
6b0b20b171 infinite loop protection 2020-05-30 01:00:41 -07:00