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

3197 Commits

Author SHA1 Message Date
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
6dd92ce122 . 2019-07-31 21:26:59 +02:00
Ghommie
1639a7002a Adds in a stereotypical vegetarian MRE. Tweaks the rest. 2019-07-31 21:02:12 +02:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Ghommie
397c62bf7a undergarment fixes. 2019-07-31 16:19:25 +02:00
Trilbyspaceclone
bbb380e043 Update medical.dm 2019-07-31 09:03:27 -04:00
Ghommie
16afae1e14 boolean 2019-07-31 03:06:20 +02:00
Ghommie
991e4e8d41 Fixes and standarizes sword sheaths/scabbards overlays. 2019-07-31 02:43:40 +02:00
Fermi
fbbc4d8589 Merge branch 'pr/21' 2019-07-29 22:57:40 +01:00
Michiyamenotehifunana
94fa4aa6d5 Merge branch 'master' into Rapid-Resprite-Service 2019-07-29 21:15:46 +08:00
kevinz000
e55563d058 Merge pull request #8990 from EgoSumStultus/his-grace-mindless-mob-fix 
Mobs eaten by His Grace now require a mind attached to count for ascension
 2019-07-29 04:47:44 -07:00
kevinz000
a95fff589c Merge pull request #8966 from Poojawa/RLD-fix 
Gives RLD adaptive overlays, adds cable color to RCL sprites
 2019-07-29 04:41:07 -07:00
kevinz000
8477a524ae Merge pull request #8978 from YakumoChen/cardbored 
Removes stealth implant box integrity
 2019-07-29 04:38:42 -07:00
kevinz000
2c3e46bbb9 Merge pull request #8982 from Ghommie/Ghommie-cit160 
[s] ports "Fixes ore satchel exploits, various storage size circumventions."
 2019-07-29 04:37:36 -07:00
kevinz000
156d525897 Merge pull request #8984 from Ghommie/Ghommie-cit162 
allows the captain sabre sheat to hold stunswords.
 2019-07-29 04:37:21 -07:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
TrilbySpaceClone
606639ce23 part 1 fixing shit 2019-07-29 05:52:49 -04:00
Ghommie
4ef1413342 dupe icons instead of snowflake vars. 2019-07-29 04:50:12 +02:00
Ghommie
2b224400e3 Adds in worn overlays for different types of cuffs. 2019-07-29 04:31:27 +02:00
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
Fermi
31709938c6 Pushing a buncha stuff so I can fix things. 2019-07-28 23:23:45 +01:00
Chayse Ramsay
5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains. 
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
 2019-07-28 17:31:59 +01:00
EgoSumStultus
223aa33b07 mind check 2019-07-28 04:43:06 -07:00
Ghommie
a9e1fadcd4 allows the captain sabre sheat to hold stunswords. 2019-07-27 22:47:36 +02:00
Ghommie
0a560b171c [s] ports "Fixes ore satchel exploits, various storage size circumventions." 2019-07-27 13:01:27 +02:00
YakumoChen
06d9dd8a52 ! 
Box no longer a damage sponge, deletes in one hit
 2019-07-26 23:55:43 +00:00
Ghommie
72413c893f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-27 01:38:20 +02:00
Sishen
68083aa0c6 a 2019-07-25 21:43:02 -04:00
Sishen
8563af71b3 Update security.dm 2019-07-25 21:43:02 -04:00
Sishen
612021b9d5 h 2019-07-25 21:43:02 -04:00
kevinz000
f4c2f1d8bc Merge pull request #8952 from CdrCross/robust-cloner 
Cloning console board memory
 2019-07-25 17:45:50 -07:00
Thalpy
123c9199ba Added Eigenlockers. I love them. 2019-07-25 20:51:09 +01:00
Poojawa
b20d9ef21c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into RLD-fix 2019-07-25 04:57:18 -05:00
Poojawa
3dabf3c42f Fixes RLD overlays, adds cable color to RCL sprites 2019-07-25 04:50:40 -05:00
Ghommie
6c712a6931 Implementing nerfs. 2019-07-24 17:58:24 +02:00
Ghommie
969aaad3d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-07-24 17:35:29 +02:00
Lasse Andersen
aac71758b7 Cloning console board memory 
Makes the cloning console circuit board have local memory of the records of the console.
 2019-07-23 14:25:03 +02:00
Michiyamenotehifunana
2845cb2e7d Resprites RCDs and RPDs 2019-07-23 20:23:45 +08:00
kevinz000
f114094138 Merge pull request #8926 from Thalpy/Secbats 
Secbats
 2019-07-22 20:15:36 -07:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
Fermi
309bc1c899 Requested change. 2019-07-20 20:34:44 +01:00
Ghom
85f87b6679 Update code/game/objects/items/melee/energy.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-07-20 21:26:18 +02:00
kevinz000
c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149 
Towels.
 2019-07-20 12:06:54 -07:00
kevinz000
ab3c5acb0e Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT 
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
 2019-07-20 11:59:05 -07:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114 
Ports the toggleable dark mode to the game!
 2019-07-20 11:57:13 -07:00
Fermi
e5648fd471 Made bat part of previous bat type. 2019-07-19 22:57:22 +01:00
Fermi
75d6768ba7 Changed how the box works so it's not a storage. 2019-07-19 22:12:05 +01:00
Ghommie
12f2b767ab removes stamina-free spammability. 2019-07-19 21:23:07 +02:00
Ghommie
b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
Fermi
4ab5060596 Adds secbats (tested) 2019-07-19 17:07:02 +01:00