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

4978 Commits

Author SHA1 Message Date
Timothy Teakettle
34c9a2f821 part 4 2020-06-11 21:45:32 +01:00
Timothy Teakettle
91d61c8560 part 3 2020-06-11 21:30:55 +01:00
Timothy Teakettle
38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
kevinz000
120826e1fc Update tanks.dm 2020-06-10 14:47:58 -07:00
kevinz000
0e58938253 Update scanners.dm 2020-06-10 14:42:27 -07:00
Timothy Teakettle
8ec5672b85 tonne of fixes 2020-06-10 21:14:08 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghom
77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -07:00
b1tt3r1n0
764ba26ace Pouches (#12432) 
* The Ammo Pouch

It holds magazines and most forms of ammo.

* The Ammo Pouch

It holds magazines and most forms of ammo.
 2020-06-09 03:22:39 -07:00
Timothy Teakettle
3692323615 plushmium: the fermichem that creates sentient plushies (#12450) 
* create plushie mob and chem

* better plush

* sentience

* fixes

* more fixes

* spelling error

* okay this works better

* more work on sentiency

* fixes

* further fixes

* revert plush storage changes, add splash effect

* fix icons

* undo a change that i guess isnt needed

* remove spaces

* plushies are now space immune

* make warning text more clear

* dont give them more health than bears?

* give them 0/1 stamina damage

* bugfix

* squeak when attacked

* small refactor
 2020-06-09 03:21:18 -07:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Ghom
8ba5c8f690 Merge pull request #12444 from shellspeed1/Makes-internal-tanks-printable 
Makes internal tanks printable at the engineering lathe
 2020-06-08 00:37:26 +02:00
kevinz000
92d1af5889 adjustments 2020-06-04 22:18:19 -07:00
kevinz000
a35fce64e2 fixes 2020-06-04 20:02:59 -07:00
kevinz000
bad809ffce fixes 2020-06-04 19:56:06 -07:00
Trilbyspaceclone
a2c4b741ad ahaha what if they didnt heal? 2020-06-04 21:46:38 -04:00
shellspeed1
2002a273de Makes empty internal tanks printable 2020-06-04 16:04:16 -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
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
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -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
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
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
Ghommie
1a9484cf2e Fixing missing clothing icons etc. 2020-06-02 17:43:31 +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
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
5b6e797c4f desword adjustments 2020-05-30 23:43:05 -07:00
kevinz000
34d8aa0ee9 refactor 2020-05-30 23:13:16 -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
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
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
Ghommie
9a9e76664f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 22:47:13 +02:00
kevinz000
9d4d6e6b6f your goddamn ass isn't a constant expression 2020-05-30 02:12:49 -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
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
kevinz000
f8741b6a0b adjust 2020-05-29 19:50:11 -07:00
kevinz000
65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -07:00