shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
a5ace5ed3a8c53e8f20b82addd7167d779665835
GS13NG/code/modules
T
History
siliconsandGitHub a5ace5ed3a Merge pull request #13543 from zeroisthebiggay/tyrna 
ports tg legion reworks, colossus now enrages against sand golems, and some minor sprite stuff with him too
2020-10-11 17:33:16 -07:00
..
actionspeed
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
admin
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
antagonists
Revert "Revert "Merge branch 'master' into eye-sprites""
2020-10-11 16:55:00 +01:00
arousal
Merge pull request #13413 from Putnam3145/fix-fuid-too-fast
2020-09-27 00:10:12 -07:00
assembly
…
asset_cache
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
atmospherics
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
awaymissions
updates all BODYPART_ORGANIC occurances
2020-10-06 18:01:25 +02:00
bsql
…
buildmode
…
cargo
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
chatter
…
client
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
2020-10-11 17:33:00 -07:00
clothing
Revert "Revert "eyes""
2020-10-11 16:54:50 +01:00
detectivework
…
economy
…
emoji
Functional* code
2020-08-20 13:50:33 +08:00
error_handler
…
events
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
fields
…
flufftext
…
food_and_drinks
Merge pull request #13533 from shellspeed1/jambalya-
2020-10-10 22:02:46 -07:00
games
…
holiday
Update holidays.dm
2020-10-10 16:47:03 -07:00
holodeck
…
hydroponics
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
instruments
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
integrated_electronics
Merge pull request #13193 from Citadel-Station-13/silicons-patch-17
2020-10-11 18:42:49 +13:00
jobs
sigh
2020-10-03 14:17:13 -07:00
keybindings
Merge pull request #13522 from silicons/async
2020-10-11 18:48:37 +13:00
language
normalization
2020-10-01 18:46:31 -05:00
library
Merge branch 'master' into spike-loot-differentces
2020-08-30 00:41:42 -04:00
lighting
…
mafia
50% more fun!
2020-08-12 17:20:29 +08:00
mapping
Merge pull request #13510 from silicons/google
2020-10-11 18:39:10 +13:00
mining
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
mob
Merge pull request #13543 from zeroisthebiggay/tyrna
2020-10-11 17:33:16 -07:00
modular_computers
tgui moment.
2020-08-22 13:11:13 +08:00
movespeed
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
newscaster
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
ninja
empulse using range
2020-09-10 19:52:34 +01:00
NTNet
something something skin texture revert. oh and oh fuck shit passkeys works again.
2020-08-22 15:07:02 +08:00
paperwork
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
photography
tgui moment.
2020-08-22 13:11:13 +08:00
plumbing
Review Change Request 1
2020-10-09 09:17:28 -04:00
pool
Makes pool actually check for the reagent instead of checking for a number.
2020-08-30 06:16:21 -07:00
power
moves damage checks
2020-10-11 16:18:25 +02:00
procedural_mapping
fix
2020-08-09 21:29:08 +08:00
projectiles
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
reagents
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
2020-10-11 17:33:00 -07:00
recycling
fix
2020-09-15 17:27:11 -07:00
research
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
ruins
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
security_levels
https://github.com/tgstation/tgstation/pull/53168/
2020-09-02 18:38:47 +03:00
shielding
debugging done
2020-09-16 00:44:57 -07:00
shuttle
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
smithing
Merge pull request #13481 from DeltaFire15/smithery-fixes
2020-10-03 18:02:42 -07:00
spells
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
station_goals
uses some cit procs. and how the fuck did i forget to componentualize this
2020-08-22 16:08:05 +08:00
surgery
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
2020-10-11 17:33:00 -07:00
tgchat
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
tgs
…
tgui
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
tgui_panel
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
tooltip
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
unit_tests
shh - this makes travis work ^w^
2020-10-11 15:58:54 +08:00
uplink
Merge pull request #13233 from Hatterhat/za-hando
2020-10-10 21:59:05 -07:00
vehicles
Update _vehicle.dm
2020-08-16 18:49:49 -07:00
vending
Revert "Revert "Merge branch 'master' into eye-sprites""
2020-10-11 16:55:00 +01:00
vore
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
VR
…
zombie
Merge pull request #13054 from KeRSedChaplain/zombies!
2020-08-09 05:42:31 -07:00