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

22536 Commits

Author SHA1 Message Date
kevinz000
3dbfc6ddf2 better support 2020-06-12 18:50:57 -07:00
kevinz000
9a08623308 sigh 2020-06-12 18:39:45 -07:00
kevinz000
e2aab5c1a5 css is really hard folks 2020-06-12 18:01:53 -07:00
kevinz000
e1a1dc61f6 this is ugly and i hate it 2020-06-12 17:50:23 -07:00
kevinz000
78e153cbe4 is this better 2020-06-12 17:32:17 -07:00
kevinz000
8e6dee515a null isn't an object 2020-06-12 17:16:36 -07:00
kevinz000
be6ea51f19 closing 2020-06-12 17:11:29 -07:00
kevinz000
c42894ddd9 css? 2020-06-12 17:07:10 -07:00
kevinz000
52ab6e557b fix 2020-06-12 17:00:01 -07:00
kevinz000
3cf14f4fad prettier 2020-06-12 16:48:22 -07:00
kevinz000
6cf18e1d49 why did i find replace 2020-06-12 16:38:28 -07:00
kevinz000
c7eead3f28 don't blind find/replace folks 2020-06-12 16:34:54 -07:00
kevinz000
146542b077 sdql2 2020-06-12 16:33:36 -07:00
kevinz000
00666422af fix 2020-06-12 15:47:46 -07:00
Timothy Teakettle
a8de357342 more simplemobs including slimes fit in pet carriers (#12494) 
* make slimes small

* cockroaches/crabs/sloths
 2020-06-11 05:43:40 -07:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghom
6b4f7886e4 Merge pull request #12471 from Citadel-Station-13/poplock 
poplocks hijack/glorious death
 2020-06-09 17:02:32 +02:00
Timothy Teakettle
14c9ab2ff1 ports tgs regal rats (#12479) 
* port regal rats

* fix missing line

* royal rat goes after humans too

* okay dont let them attack people

* let them attack people but at less damage

* remove header
 2020-06-09 03:28:00 -07:00
Ghom
77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -07:00
Trilbyspaceclone
81070b8ada New fermi chem Zeolites! (#12428) 
* Zeolites!

* No loner hs debug numbers...
 2020-06-09 03:25:40 -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
kevinz000
139720e2ce Update code/modules/antagonists/traitor/classes/martyr.dm 
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-06-08 21:16:32 -07:00
kevinz000
3960050c71 Update code/modules/antagonists/traitor/classes/hijack.dm 
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-06-08 21:16:26 -07:00
Ghom
798de9baf1 Porting "Speeds up /datum/light_source/proc/update_corners() by 16% or so" (#12496) 2020-06-08 21:15:26 -07:00
Ghom
907d909861 Merge pull request #12493 from DeltaFire15/eldritch-affairs-exploit-fix 
[s] xenobio golems can no longer be used to exploit eldritch affairs mechanics
 2020-06-09 02:22:04 +02:00
DeltaFire
e2466f1e22 tiny bit of better performance 2020-06-08 21:29:29 +02:00
DeltaFire
bacd5b8478 oops 2020-06-08 19:10:39 +02:00
DeltaFire
c29be22f9b no more gamer time 2020-06-08 19:06:41 +02:00
Lin
52d6069e40 Merge pull request #12446 from kevinz000/hotkey_fixes 
Adds modifier-independent hotkey bindings
 2020-06-08 11:28:49 -05:00
Lin
1e3fd46c2d Merge pull request #12472 from Citadel-Station-13/kevinz000-patch-9 
makes default photosynthesis MUCH less punishing
 2020-06-08 11:25:15 -05:00
NopemanMcHalt
e5bc651140 Station has a crew loose (Adds Orville-inspired(?) uniform) (#12447) 
* Station has a crew loose

Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform

* hotfix for digi ops
 2020-06-08 09:14:19 -07:00
DeltaFire15
efddaa8cad removes early return (#12483) 
This early return, while skipping a few things, is a bad ideaas this pretty much allowed silicons to still interact with the station off-z as it 'skipped' the check for it.
 2020-06-08 09:10:06 -07:00
Ghom
f3af445c94 Update material_container.dm (#12491) 2020-06-08 09:09:53 -07:00
Ghom
881dfe81c5 Merge pull request #12187 from Trilbyspaceclone/patch-373 
Nerfs cargo gas selling - MK different pr then the one that addresses this
 2020-06-08 08:21:07 +02:00
Trilbyspaceclone
6cf4985360 Update large_objects.dm 2020-06-08 01:09:27 -04:00
Trilbyspaceclone
abaf633ab9 Update large_objects.dm 2020-06-08 01:09:06 -04:00
Ghom
911e45e526 Merge pull request #12443 from timothyteakettle/fix-blueprints 
fixes dumb blueprint bug to do with noteleport
 2020-06-08 00:38:02 +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
Ghom
1f65381a09 Merge pull request #12463 from DeltaFire15/ling-specialrole-fuckery 
Quick ling on_removal() fix
 2020-06-08 00:35:45 +02:00
Ghom
231c11a6ad Merge pull request #12465 from Linzolle/shotgun-fix 
shotguns no longer delete shells in their chamber after firing
 2020-06-08 00:34:31 +02:00
Ghom
941525c74a Merge pull request #12462 from timothyteakettle/fix-kudzu 
fixes spacevines
 2020-06-08 00:33:51 +02:00
Ghom
0b0d70fca9 Merge pull request #12464 from DeltaFire15/keycard-auth-changes 
Makes keycard authentication devices... actually authenticate keycards.
 2020-06-08 00:32:10 +02:00
kevinz000
5b863e7e9b Update photosynthesis.dm 2020-06-07 03:43:41 -07:00
kevinz000
6f62cb8678 Update photosynthesis.dm 2020-06-07 03:40:34 -07:00
kevinz000
210c873fe6 Update martyr.dm 2020-06-07 02:12:28 -07:00
kevinz000
7b69daffd7 Update hijack.dm 2020-06-07 02:12:12 -07:00
kevinz000
35abf4ffc9 Update traitor_class.dm 2020-06-07 02:11:43 -07:00
kevinz000
eceb46d02b Update datum_traitor.dm 2020-06-07 02:10:28 -07:00
Linzolle
fe6cf2dd44 ramsay broke every shotgun 2020-06-06 14:22:23 -05:00