shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,298 Commits 5 Branches 0 Tags
bcc92d234bc67770637745c5ad4eccdef25ecaeb
Commit Graph

5315 Commits

Author SHA1 Message Date
kevinz000
bcc92d234b Merge pull request #9386 from Sishen1542/suitrad 
Gives suit storage units the ability to remove radiation from mobs
 2019-10-11 12:13:04 -07:00
kevinz000
0643a7b230 Merge pull request #9387 from Sishen1542/goose 
the geese have been unleased
 2019-10-11 12:11:50 -07:00
kevinz000
9120e4b7c8 Merge pull request #9399 from Arturlang/patch-1 
[s] Adds a distance check to the supermatter tongs consume action, ported from TG
 2019-10-11 12:10:53 -07: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
kevinz000
9cd75c82a4 Merge pull request #9435 from Linzolle/firefix 
fix fireman carry offhand not automatically deleting itself
 2019-10-11 12:09:14 -07:00
kevinz000
98d03c73be Merge pull request #9459 from dapnee/Imagine-people-reading-code-to-see-if-it-forgets-something 
Imagine Updating How Tables Work, But Forgetting MY TABLES
 2019-10-11 12:05:53 -07:00
kevinz000
1896b43c79 Merge pull request #9451 from Ghommie/Ghommie-cit224 
standarizes mobs' can_equip arguments.
 2019-10-11 12:05:12 -07:00
Dap
293034d815 Imagine Updating How Tables Work, But Forgetting MY TABLES 
## About The Pull Request

Let me just add in a single line so plasmaglass tables actually work.

## Changelog
🆑
fix: You can now make plasmaglass tables again.
/🆑
 2019-10-10 09:04:06 -06:00
kevinz000
3e6415d4b5 Merge pull request #9324 from Linzolle/crusher 
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
 2019-10-10 02:23:15 -07:00
kevinz000
89747a3a6e Merge pull request #9368 from Seris02/master 
Fixes luminescent dark blue major effect and changes the "autoprocess" button to "autoclone"
 2019-10-10 02:18:25 -07:00
kevinz000
236dcc4d63 Merge pull request #9452 from Ghommie/Ghommie-cit225 
Stops non-alphanumeric graffiti decals from being named "letter".
 2019-10-10 02:10:08 -07:00
kevinz000
f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45 
Virtual reality componentization.
 2019-10-10 02:09:51 -07:00
kevinz000
0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11 
Refactoring Implants' loc n°3
 2019-10-10 02:09:37 -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
Ghommie
cfccacafbf Stops all graffiti decals from being named "letter". 2019-10-09 01:54:38 +02:00
Ghommie
735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Ghommie
dac6fef57a Also implementing /tg/station pr #40767 2019-10-09 00:38:09 +02:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
kevinz000
fe1a78f413 Merge pull request #9421 from Ghommie/Ghommie-cit218 
Porting some spraycan fixes and tweaks.
 2019-10-08 00:34:58 -07:00
kevinz000
abef83f56e Merge pull request #9427 from Ghommie/Ghommie-cit219 
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
 2019-10-08 00:34:33 -07:00
kevinz000
143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head 
QM is a head of staff, Cargo ID Console added
 2019-10-08 00:34:07 -07:00
kevinz000
8aacedaefa Merge pull request #9316 from Thalpy/Reagents_bitflats 
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
 2019-10-08 00:33:21 -07:00
kevinz000
06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178 
Ports plasmaman departmental envirosuits and tweaks.
 2019-10-08 00:28:06 -07:00
kevinz000
76ede7a473 Merge pull request #9406 from Poojawa/carpet-colors 
More Carpet colors and liquid carpet varients
 2019-10-07 23:39:52 -07:00
kevinz000
dcb37bfd0e Merge pull request #9418 from Ghommie/Ghommie-cit216 
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
 2019-10-07 23:36:11 -07:00
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01: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
nik707
de117afd8b Merge pull request #9410 from Poojawa/cryopod-tweaks 
Fixes Cryopod quirks, makes the menu not complete shit
 2019-10-07 18:24:38 -05:00
Linzolle
4bdd38b422 i feel like this is a really stupid way to fix it 2019-10-07 16:17:42 -05:00
Ghommie
99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02:00
Ghommie
159d2a188d peeve. 2019-10-07 17:38:36 +02:00
Ghommie
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Ghommie
f01f00710f Porting some spraycan fixes. 2019-10-06 05:30:16 +02:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie
cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Ghommie
32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
kevinz000
a923ea984a Merge pull request #9388 from Sishen1542/dynamicadminfix 
Dynamic now auto-deadmin friendly
 2019-10-05 08:22:47 -07:00
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Poojawa
9d2d84f53d Update table_frames.dm 2019-10-04 15:49:25 -05:00
Poojawa
35d33b4f3b mob_occupant 2019-10-04 10:05:08 -05:00
Poojawa
cda97faaa5 UI and proper deletion stuff 2019-10-04 09:52:42 -05:00
Poojawa
209b195822 this probably doesn't fix the shitty console, but 2019-10-04 07:31:31 -05:00
Poojawa
0716b48a99 unmodularize it 2019-10-04 06:56:57 -05:00
Poojawa
6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Poojawa
27b26978be Quartermaster is a head of staff 
Suck it, non believers.
 2019-10-03 19:13:56 -05:00
Arturlang
47037c1d57 Instakill-man-bad 
OwO
 2019-10-03 10:54:56 +03:00
Seris02
eb3f26545d Merge pull request #3 from Citadel-Station-13/master 
Updating my fork on a web browser, oof
 2019-10-02 16:11:02 +08:00
kevinz000
08ed166c08 Merge pull request #9365 from Ghommie/Ghommie-cit211 
Fixing an issue with DNA scanners maintenance hatches with sleeper code updates.
 2019-10-02 00:06:13 -07:00
kevinz000
af9336edde Merge pull request #9366 from Raptorizer/MelonSeedBuff 
Equalized the power of the melon seed.
 2019-10-02 00:01:05 -07:00