shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,060 Commits 5 Branches 0 Tags
bf92aa2ffb09d69e3576ce3e0ae87788d4bcd3bd
Commit Graph

5530 Commits

Author SHA1 Message Date
nik707
187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1 
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
 2019-10-25 22:16:02 -05:00
kevinz000
49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267 
Unmodularize lavaknights and emags.
 2019-10-25 20:12:35 -07:00
Ghommie
c1f84da39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 12:26:17 +02:00
kevinz000
7beb00abba Merge pull request #9593 from Ghommie/Ghommie-cit263 
Fixing gulag teleporter stripping the user of stuff it really shouldn't.
 2019-10-24 19:10:17 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
kevinz000
da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00
kevinz000
d5041b7dde Merge pull request #9582 from Putnam3145/dynamic-config 
Adding dynamic rules to the game config
 2019-10-24 18:55:29 -07:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie
a62fcdcccb forgot about the file extension. 2019-10-25 03:34:13 +02:00
Ghommie
4b0b130c36 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 00:27:04 +02:00
Ghommie
85b35433b2 Unmodularize Eutactic Blades. 2019-10-25 00:14:38 +02:00
Ghommie
29584aff69 emagged travis now succeeds. 2019-10-24 23:11:18 +02:00
Ghommie
f01b5c853f Unmodularize lavaknights. 2019-10-24 22:08:36 +02:00
Ghommie
7b257242c2 bullets won't work... 2019-10-24 10:44:57 +02:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
deathride58
724e4305e1 Fixes examinetext of mobs not actually showing when items are bloodstained by making get_examine_name() properly take blood-stained status into account 2019-10-23 21:08:59 -04:00
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2019-10-23 20:54:55 -04:00
Ghommie
452658b16c Code improvement. 2019-10-23 21:26:43 +02:00
Ghommie
0e6033a576 Fixing gulag teleporter stripping the user of stuff it really shouldn't. 2019-10-23 21:21:05 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
ba307b01a5 Defib fixes and chem effects stuff 2019-10-23 13:45:57 +02:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
kevinz000
e226a79c9b Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art 
Code stuffs + more framework for cargo rework cuz atomic prs are good
 2019-10-22 23:11:56 -07:00
Putnam
67662d1d69 everything works now 2019-10-22 21:39:28 -07:00
Putnam
bacc875524 added actual game configs to all the dynamic modes 2019-10-22 19:12:54 -07:00
nik707
9a598a92cb Merge pull request #9561 from Ghommie/Ghommie-cit256 
Fixing some ayy overlays and client images oddities.
 2019-10-22 16:49:07 -05:00
nik707
fc56fd9f8b Merge pull request #9565 from Citadel-Station-13/kevinz000-patch-103 
Fixes and nerfs VTEC upgrades
 2019-10-22 16:48:10 -05:00
kevinz000
b9c96715b4 Merge pull request #9551 from Ghommie/Ghommie-cit254 
Fixes recycler deleting all clothing for mobs found inside items (e.g bluespace bodybags)
 2019-10-22 02:28:56 -07:00
kevinz000
2426849d4b this is a pretty bad idea 2019-10-22 02:19:33 -07:00
Poojawa
d6e28180a1 if this doesn't work, I won't be fixing it 2019-10-22 00:34:25 -05:00
Poojawa
7e27c46c78 Fuck components 2019-10-22 00:33:58 -05:00
Poojawa
7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58
ee0357b2c4 Merge pull request #9214 from Sishen1542/mechshit 
properly ports neovgre from hippie
 2019-10-21 21:17:57 -04:00
deathride58
2742c86723 Merge pull request #9072 from Poojawa/gen-poppers 
Genpop for security
 2019-10-21 21:15:01 -04:00
Trilbyspaceclone
b4b875bf26 Merge branch 'master' into A_Tailer's_art 2019-10-21 21:06:21 -04:00
Poojawa
6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
BlackMajor
b77a94bd7d Merge pull request #9370 from Citadel-Station-13/kevinz000-patch-88 
buffs c4 on mobs
 2019-10-22 11:04:30 +13:00
kevinz000
c0d4d32dee Update robot_upgrades.dm 2019-10-21 14:36:21 -07:00
Ghommie
760522cf6a Fixing some ayy overlays and client images oddities. 2019-10-21 11:29:43 +02:00
kevinz000
4a28b7ea2d Merge pull request #9547 from Ghommie/Ghommie-cit250 
Fixes silicons being unable to use the teleporter and records consoles from a distance
 2019-10-21 01:07:27 -07:00
kevinz000
838575da50 Merge pull request #9503 from deathride58/tasernerf 
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
 2019-10-21 00:59:58 -07:00
Ghommie
ef35aefe4e Fixes recycler deleting all clothing for mobs found inside items (e.g. bluespace bodybags) 2019-10-20 15:41:48 +02:00
Ghommie
12192de0cd also records consoles. 2019-10-20 10:14:50 +02:00
Ghommie
bcd6902f06 Fixes silicons being unable to use the teleporter console from a distance. 2019-10-20 10:08:58 +02:00
Ghommie
e991328087 progress 2019-10-19 15:02:56 +02:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
TrilbySpaceClone
18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
kevinz000
a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241 
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
 2019-10-17 17:29:18 -07:00
kevinz000
1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL 
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
 2019-10-17 13:23:33 -07:00