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

2335 Commits

Author SHA1 Message Date
Fermi
ca2467ff93 Thingie 2019-11-26 23:14:14 +00:00
Fermi
c5e6cb8ac0 space 2019-11-26 04:08:10 +00:00
Fermi
69e0f6836a Adds a lil message so people don't spend 25 minutes trying everything 2019-11-26 04:05:43 +00:00
Thalpy
7b17bf2acd god damn bitflags ARGH 2019-11-21 20:30:49 +00:00
Thalpy
7460c28b60 Merge branch 'OrganQoL' of https://github.com/Thalpy/Citadel-Station-13 into OrganQoL 2019-11-21 19:39:58 +00:00
Thalpy
0cce3a01f4 Ghommie's requiem 2019-11-21 19:39:55 +00:00
Thalpy
a0a52018f3 Apply suggestions from code review 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-21 19:06:34 +00:00
Thalpy
da1da717d2 Update code/game/objects/items/devices/scanners.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-21 19:03:48 +00:00
Thalpy
bd07ff4bf7 This should be the one! 2019-11-21 18:55:43 +00:00
Thalpy
00bffba7ea Why do surgeries always end up with jank 2019-11-21 15:57:21 +00:00
Fermi
b911fabb37 Okay bedtime 2019-11-21 04:25:25 +00:00
Fermi
b90213882e Again with the rouge 2019-11-21 03:58:16 +00:00
Fermi
01f465dc8c Scanner formatting 2019-11-21 03:52:00 +00:00
Fermi
18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
Fermi
cc53a0061f Well it compiles 2019-11-21 02:15:58 +00:00
kevinz000
7503366524 Merge pull request #9853 from Ghommie/Ghommie-cit370 
Adds a few extra cardboard cutout variants.
 2019-11-19 21:38:32 -07:00
kevinz000
56413c1460 Merge pull request #9846 from KathrinBailey/IKEA-station-13 
IKEA Station 13: Import TG's Pews
 2019-11-19 21:30:56 -07:00
kevinz000
f883f55391 Merge pull request #9818 from GrayRachnid/portssaboteur 
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
 2019-11-19 21:28:25 -07:00
kevinz000
2494ea4d07 Merge pull request #9824 from YakumoChen/YakumoChen-mariplush 
Adds Marisa plushie
 2019-11-19 01:55:59 -07:00
kevinz000
40a01dedfe Merge pull request #9806 from BlackMajor/Yote 
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
 2019-11-19 01:54:47 -07:00
Lin
c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349 
Unmodularize bikehorns and holy weapons.
 2019-11-19 03:24:38 +00:00
Ghommie
86072fe682 " 2019-11-18 04:15:33 +01:00
Ghommie
deadffe96f missing parenthesis. 2019-11-18 03:26:04 +01:00
Ghommie
1c39a3bc6d Adds a few extra cardboard cutout variants. 2019-11-18 03:23:24 +01:00
KathrinBailey
05c74c731b Ports TG pew files 2019-11-17 14:20:44 +00:00
YakumoChen
5c89447cf9 Update plushes.dm 2019-11-16 09:56:57 +00:00
GrayRachnid
3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. 2019-11-15 16:58:45 -05: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
Ghommie
5bb6247a6d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349 2019-11-15 00:57:38 +01:00
kevinz000
d5a245945c Merge pull request #9742 from Seris02/gpsthing 
makes gps show location on examine
 2019-11-14 16:44:40 -07:00
kevinz000
ca99a8285c Merge pull request #9803 from Ghommie/Ghommie-cit350 
Ports Improved beach away mission and some fluff mapping items.
 2019-11-14 16:36:19 -07:00
kevinz000
8c247a566a Merge pull request #9783 from Ghommie/Ghommie-cit343 
Fixing Aux base camera RCD door settings and toggle window type actions.
 2019-11-14 16:22:08 -07:00
kevinz000
4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2019-11-14 16:00:45 -07:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 
Purging a lot of space indention in favor of tabs.
 2019-11-14 15:55:04 -07:00
kevinz000
8f08e1017e Merge pull request #9688 from Ghommie/Ghommie-cit306 
Fixing gibspawner runtimes and improving them, how gruesome...
 2019-11-14 15:51:20 -07: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
kevinz000
dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220 
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
 2019-11-14 15:44:59 -07:00
Ghommie
322c90fab2 Mistake I have done when copypasting. 2019-11-14 13:32:57 +01:00
kevinz000
487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340 
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
 2019-11-14 01:40:16 -07:00
kevinz000
3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335 
Dreamchecker compatibility changes, part 1.
 2019-11-14 01:37:41 -07:00
BlackMajor
0c33757b14 Fixes a few bugs 2019-11-14 18:54:57 +13:00
BlackMajor
ce94da9ed3 Merge branch 'master' into Yote 2019-11-14 17:37:57 +13:00
BlackMajor
b9a7685830 Adds dogborg catch for doggos and some 2019-11-14 17:14:14 +13:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Ghommie
3ce4ef8e27 f 2019-11-13 21:17:40 +01:00
Ghommie
cef72b93eb The files. 2019-11-13 20:35:21 +01:00
Ghommie
248586cfd7 Unmodularize bikehorns and holy weapons. 2019-11-13 20:28:19 +01:00
TrilbySpaceClone
ec57e28c17 Merge branch 'master' into Cargo_MKII 2019-11-13 08:00:24 -05:00
kevinz000
e142ed03dd Merge pull request #9773 from Ghommie/Ghommie-cit339 
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
 2019-11-12 23:58:15 -07:00
kevinz000
a16219d97a Merge pull request #9772 from DeltaFire15/weh 
Adds eight new plushies to the game while integrating kevs' plush PR
 2019-11-12 23:56:01 -07:00