shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,116 Commits 5 Branches 0 Tags
cebf2d2de293fc40f344da3ee8a478e3bdb9e6bb
Commit Graph

370 Commits

Author SHA1 Message Date
kevinz000
75510d8da9 Merge pull request #9749 from Trilbyspaceclone/patch-238 
What do you mean I cant hold the armory on my back? -BOH nerf
 2019-11-23 11:42:37 -07:00
Lin
2412bad483 Merge pull request #9889 from GrayRachnid/fixgoldbox 
Fixes gold toolbox inhand sprite having the wrong name
 2019-11-22 01:14:39 +00:00
GrayRachnid
4ae76cf1d9 WHY 
D
 2019-11-20 23:11:46 -05:00
GrayRachnid
48d1bd1160 fixes goldbox 2019-11-20 18:47:35 -05:00
Useroth
e2c8efa824 Oopsie. I need to stop committing code without comipiling. 2019-11-20 15:36:55 +01:00
Useroth
2a8152c835 Applied suggestions. 2019-11-20 15:15:10 +01:00
Useroth
5169205a19 Added a 10pack as well 2019-11-19 19:35:37 +01:00
Ghommie
c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 2019-11-15 01:10:39 +01:00
kevinz000
d8e89b235f Merge pull request #9689 from Ghommie/Ghommie-cit307 
How many times I have encountered this sort of issue in the past and how much of a meme it was...
 2019-11-14 15:50:52 -07:00
Ghommie
63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000
501dfbb43a Merge pull request #9715 from Ghommie/Ghommie-cit316 
Ports CEV-Eris resprited matchbox, also respriting cigar boxes myself.
 2019-11-10 11:27:36 -07:00
Trilbyspaceclone
96a8302dac Fine you can boh bomb again 2019-11-08 21:11:44 -05:00
Trilbyspaceclone
5e1ab01733 What do you mean I cant hold the armory on my back? 
But mmmmmuuuummmm I want to have 12 duffle bags in my bag of holding!!!
 2019-11-08 21:05:30 -05:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie
1a2901f197 Ports CEV-Eris matchbox respriting, also respriting cigar boxes. 2019-11-04 16:14:12 +01:00
Ghommie
0cce37cedb How many times I have encountered theis sort of issues in the past and how much of a meme it was... 2019-11-02 20:18:40 +01:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
kevinz000
d7e8b5209f Update bags.dm 2019-10-27 20:36:32 -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
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
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Thalpy
acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01:00
Thalpy
e71a70f406 Adds medolier + bag antics 2019-10-15 11:40:07 +01:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
lolman360
c694cb8652 h 2019-10-09 13:35:23 +11:00
lolman360
645b8ddf39 cmo: the new CE 
loot him for tools
 2019-10-09 13:32:45 +11:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
Poojawa
0482973e8f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 22:38:12 -05:00
kevinz000
250c6ed986 Merge pull request #9367 from Poojawa/totally-radical 
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
 2019-10-01 00:12:32 -07:00
Poojawa
9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags 
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
 2019-09-28 03:22:17 -05:00
Poojawa
5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
Fermi
97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Trilbyspaceclone
d61afe0021 Update uplink_kits.dm 2019-09-10 20:29:31 -04:00
Trilbyspaceclone
02771c9d27 Why didnt my last commit save at all? 2019-09-08 22:10:31 -04:00
TrilbySpaceClone
0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00
Poojawa
dca90db321 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-29 23:03:26 -05:00
nik707
bff828d3be Merge pull request #9202 from Trilbyspaceclone/patch-216 
Ports "Fixes wallets #510" From KeplerStation
 2019-08-29 19:33:08 -05:00
BlackMajor
4d6b9f5da1 Merge pull request #8537 from Ghommie/Ghommie-cit28 
Fixes emags wasting charges on un-emaggable stuff.
 2019-08-28 13:54:03 +12:00
Trilbyspaceclone
77863119f2 Update wallets.dm 2019-08-27 11:31:52 -04:00
Poojawa
bd49187ea7 on second thought, let's not try to half ass fancy ideas. 2019-08-26 14:45:36 -05:00