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

34293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghom
6b4f7886e4 Merge pull request #12471 from Citadel-Station-13/poplock 
poplocks hijack/glorious death
 2020-06-09 17:02:32 +02:00
CitadelStationBot
64bc0e1917 Automatic changelog generation for PR #12363 [ci skip] 2020-06-09 07:34:26 -05:00
Trilbyspaceclone
f42994c79b Toxin tweaks! Just storage (#12363) 
* Toxin tweaks

* bepis readd

* paintings

* Update DeltaStation2.dmm

* Fixed
 2020-06-09 05:34:22 -07:00
CitadelStationBot
2c2418c357 Automatic changelog generation for PR #12479 [ci skip] 2020-06-09 05:28:04 -05: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
CitadelStationBot
d281b963af Automatic changelog generation for PR #12481 [ci skip] 2020-06-09 05:26:23 -05:00
Ghom
77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -07:00
CitadelStationBot
97a789b5fe Automatic changelog generation for PR #12428 [ci skip] 2020-06-09 05:25:44 -05: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
CitadelStationBot
e593bfe423 Automatic changelog generation for PR #12450 [ci skip] 2020-06-09 05:21:21 -05: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
CitadelStationBot
26ef2c6812 Automatic changelog generation for PR #12496 [ci skip] 2020-06-08 23:15:29 -05: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
CitadelStationBot
63e766545f Automatic changelog generation for PR #12493 [ci skip] 2020-06-08 19:22:07 -05: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
Changelogs
f3d1831f28 Automatic changelog compile [ci skip] 2020-06-09 00:07:49 +00: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
CitadelStationBot
8deb5e7d07 Automatic changelog generation for PR #12446 [ci skip] 2020-06-08 11:28:53 -05:00
Lin
52d6069e40 Merge pull request #12446 from kevinz000/hotkey_fixes 
Adds modifier-independent hotkey bindings
 2020-06-08 11:28:49 -05:00
CitadelStationBot
2adfb1f53a Automatic changelog generation for PR #12472 [ci skip] 2020-06-08 11:25:19 -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
CitadelStationBot
30de7e93e7 Automatic changelog generation for PR #12447 [ci skip] 2020-06-08 11:14:23 -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
CitadelStationBot
a82064712f Automatic changelog generation for PR #12483 [ci skip] 2020-06-08 11:10:09 -05: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
CitadelStationBot
581470684a Automatic changelog generation for PR #12491 [ci skip] 2020-06-08 11:09:56 -05:00
Ghom
f3af445c94 Update material_container.dm (#12491) 2020-06-08 09:09:53 -07:00
CitadelStationBot
a08eec3f73 Automatic changelog generation for PR #12187 [ci skip] 2020-06-08 01:21:10 -05: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
Changelogs
909b8f40c5 Automatic changelog compile [ci skip] 2020-06-08 00:07:59 +00:00
CitadelStationBot
8532109c27 Automatic changelog generation for PR #12443 [ci skip] 2020-06-07 17:38:05 -05: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
CitadelStationBot
ec157a25b0 Automatic changelog generation for PR #12444 [ci skip] 2020-06-07 17:37:28 -05: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
CitadelStationBot
c11690e490 Automatic changelog generation for PR #12463 [ci skip] 2020-06-07 17:35:49 -05: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
CitadelStationBot
c5ad83da58 Automatic changelog generation for PR #12465 [ci skip] 2020-06-07 17:34:35 -05: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
CitadelStationBot
2a54a62ac0 Automatic changelog generation for PR #12462 [ci skip] 2020-06-07 17:33:54 -05:00
Ghom
941525c74a Merge pull request #12462 from timothyteakettle/fix-kudzu 
fixes spacevines
 2020-06-08 00:33:51 +02:00
CitadelStationBot
70b4f4a9bf Automatic changelog generation for PR #12464 [ci skip] 2020-06-07 17:32:13 -05: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
CitadelStationBot
a9eb0ba9e5 Automatic changelog generation for PR #12478 [ci skip] 2020-06-07 11:23:17 -05:00