shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,694 Commits 5 Branches 0 Tags
51bc7a5dec8cf475f87e757ebfaa6401946e4d5c
Commit Graph

19089 Commits

Author SHA1 Message Date
kevinz000
51bc7a5dec Merge pull request #10909 from Citadel-Station-13/Ghommie-patch-3 
Fixes the panic bunker persistence.
 2020-02-05 23:43:05 -07:00
Ghom
181944bb36 Update admin_ranks.dm 2020-02-06 03:07:42 +01:00
Ghom
6d78d01612 Merge pull request #10903 from Hatterhat/tg-47770 
fuck organ decay - tgstation#47770
 2020-02-05 19:26:40 +01:00
Ghom
69c4cde323 Merge pull request #10915 from Citadel-Station-13/kevinz000-patch-5 
jackboot magpistols are a thing again
 2020-02-05 19:22:36 +01:00
Ghom
deb1686ce2 Merge pull request #10911 from Tupinambis/StunbatonFUCK 
Addendum to PR #10812. REGEN STAMINA WHATEVER FUCK COMBAT REWORK IS CONFUSING
 2020-02-05 19:19:41 +01:00
Ghom
7e8bc10b8e Merge pull request #10894 from Trilbyspaceclone/carps 
Buffs carps again
 2020-02-05 18:32:18 +01:00
kevinz000
a45038d214 Update pockets.dm 2020-02-05 03:31:55 -07:00
kevinz000
f05d37b7fd Merge pull request #10855 from Trilbyspaceclone/patch-274 
The Syndicats are run by aliens - Fixes Alien cargo crate to be  correction emag
 2020-02-05 01:10:21 -07:00
Ghom
02d1761c0a Merge pull request #10747 from Citadel-Station-13/kevinz000-patch-11 
shoving someone into a wall on the second shove now also disarms their weapon
 2020-02-05 07:38:14 +01:00
Ghom
4cdade4b2d Merge pull request #10788 from Seris02/crushboots 
crushing magboots for tators
 2020-02-05 07:36:14 +01:00
Tupinambis
3539fa7603 Stunbaton PR had bad math didn't properly reduce effectiveness oops. 2020-02-05 00:31:54 -06:00
Ghom
402283e86a Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks 
[READY] Further tweaks to bloodsuckers
 2020-02-05 07:23:36 +01:00
Ghom
4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks 
Consent logging
 2020-02-05 07:19:37 +01:00
Ghom
68cbc3487a Update species.dm 2020-02-05 07:09:55 +01:00
Ghom
77eb7b8a96 Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL 
Stunbaton Balance Adjustments 2.0 (Unfucked Edition)
 2020-02-05 07:02:11 +01:00
Trilbyspaceclone
1547f99ddb Update carp.dm 2020-02-05 00:59:16 -05:00
Ghom
472bddb5be Merge pull request #10869 from kevinz000/WHY 
can we talk about how admin attack logs being viewable in game is not a good thing, alternatively "i want a word with whoever coded mech logging"
 2020-02-05 06:52:20 +01:00
Ghom
aaa45f102e Merge pull request #10875 from ancientpower/m-bunny-ears 
Adds bunny ear style for humans and anthromorphs
 2020-02-05 06:50:10 +01:00
Ghom
6159c197bb Update persistence.dm 2020-02-05 06:30:50 +01:00
Ghom
57ac5c3d66 Update carp.dm 2020-02-05 06:12:57 +01:00
Trilbyspaceclone
4ecbd1e407 Update carp.dm 2020-02-04 22:00:33 -05:00
Trilbyspaceclone
fb2498781c Update carp.dm 2020-02-04 20:29:50 -05:00
Ghom
b4ba381b59 Merge pull request #10739 from r4d6/Dwarven_Language 
Add a Dwarf Language
 2020-02-05 02:03:42 +01:00
Hatterhat
fe717597da fuck fermichem 2020-02-04 18:35:26 -06:00
Ghom
642a8c4217 Merge pull request #10893 from Arturlang/TGUI_Next_Crafting 
[READY]TGUI Next Crafting
 2020-02-05 00:04:21 +01:00
Lin
66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3 
Fixing little blood bank gnerator examine runtime error.
 2020-02-04 20:36:28 +00:00
Lin
e8ea16c3f2 Merge pull request #10874 from Citadel-Station-13/Ghommie-patch-6 
Fixes the petting element.
 2020-02-04 20:34:59 +00:00
Ghom
c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker 
Save panic bunker between rounds
 2020-02-04 21:15:37 +01:00
Trilbyspaceclone
8458340541 Update science.dm 2020-02-04 14:38:24 -05:00
TrilbySpaceClone
f66d401516 forgot to move the var 2020-02-04 07:16:15 -05:00
Artur
614a44ea18 Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting 2020-02-04 13:11:02 +01:00
TrilbySpaceClone
4842e29c2e buffs carps again 2020-02-04 07:09:50 -05:00
Trilbyspaceclone
e237fefbf4 Update science.dm 2020-02-04 06:45:37 -05:00
Artur
ed60724a8e Whoops 2020-02-04 12:13:14 +01:00
Artur
0391513220 Works now 2020-02-04 12:05:15 +01:00
kevinz000
13df3dbb05 Merge pull request #10867 from Ghommie/Ghommie-cit551 
Further buff and fix to the clown ops' tearstache grenade.
 2020-02-04 03:55:22 -07:00
kevinz000
aa129b9539 Update species.dm 2020-02-04 03:46:13 -07:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547 
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
 2020-02-04 03:39:14 -07:00
kevinz000
66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550 
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
 2020-02-04 03:35:33 -07:00
kevinz000
be09322f8e Merge pull request #10882 from Citadel-Station-13/Ghommie-patch-8 
Fixes "2048" subtle emotes.
 2020-02-04 03:34:52 -07:00
kevinz000
f5cd0cf48f Merge pull request #10872 from Arturlang/reflective_ornot 
Makes shield no longer block energy projectiles and be destroyed when damaged too much.
 2020-02-04 03:34:16 -07:00
kevinz000
ab696ac50a Merge pull request #10847 from Citadel-Station-13/Ghommie-patch-2 
Fixes Space Ninja "Nothing" Objective.
 2020-02-04 03:33:55 -07:00
kevinz000
b34d6cba0c Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1 
Hello subtler roleplayers, I see you.
 2020-02-04 03:33:14 -07:00
kevinz000
d5a44097a3 Merge pull request #10862 from Hatterhat/boy-i-fucked-up-that-examine 
seed extractor examine tweak/fix
 2020-02-04 03:32:57 -07:00
kevinz000
8f83e8c107 Merge pull request #10860 from deathride58/combatmodeclickdrag 
Makes quick item usage (click-dragging unequipped item) require combat mode
 2020-02-04 03:32:39 -07:00
Artur
0452286468 Fixes no thrall bloodcost 2020-02-04 11:21:47 +01:00
kevinz000
97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549 
A PR about runtime errors
 2020-02-04 03:20:34 -07:00
Artur
4bd916d08a Adds the initial crafting UI stuff. 2020-02-04 10:28:53 +01:00
Ghom
d451115bf1 Merge pull request #10854 from Seris02/meteoralertchange 
Makes a proc for meteor string gen
 2020-02-04 08:15:32 +01:00
Seris02
0e13afc10f yeet 2020-02-04 13:25:14 +08:00