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

5825 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
34a8dc5962 Merge pull request #9850 from Ghommie/Ghommie-cit368 
fixing a few minor issues with console frames building.
 2019-11-19 21:38:58 -07: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
779fac99b4 Merge pull request #9829 from Ghommie/Ghommie-cit361 
Unborking id consoles.
 2019-11-19 21:33:14 -07:00
kevinz000
755559bb66 Merge pull request #9836 from Ghommie/Ghommie-cit364 
Ports "Uses defines for turf atmos"
 2019-11-19 21:32:42 -07:00
kevinz000
c7765a032b Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak 
Dynamic summon events tweaks
 2019-11-19 21:31:14 -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
4d1a9a0773 Merge pull request #9816 from Ghommie/Ghommie-cit356 
Ports "Fixes MMIs not being able to use mecha equipment"
 2019-11-19 21:30:13 -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
Ghommie
bd41cfbfc5 fixing a few minor issues with console frames building. 2019-11-17 22:44:37 +01:00
KathrinBailey
05c74c731b Ports TG pew files 2019-11-17 14:20:44 +00:00
Putnam
ba091b3a27 limited midround wizard summon events possibilities 2019-11-17 05:56:19 -08:00
Ghommie
641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
Ghommie
613605e0d0 Unborking id consoles. 2019-11-16 17:49:12 +01:00
YakumoChen
5c89447cf9 Update plushes.dm 2019-11-16 09:56:57 +00:00
kevinz000
21775ad3ee Merge pull request #9813 from Ghommie/Ghommie-cit355 
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
 2019-11-16 01:24:58 -07:00
kevinz000
66f8b5f404 Merge pull request #9769 from Ghommie/Ghommie-cit336 
ID console fixes and other tweaks.
 2019-11-16 01:17:23 -07: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
78c967fa20 A 2019-11-15 18:42:04 +01:00
Ghommie
2b104a7698 Ports "Fixes MMIs not being able to use mecha equipment" 2019-11-15 18:40:45 +01:00
Putnam
f3c4897b48 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 22:31:48 -08:00
Putnam
009c0b46d5 Added some more blocking rules (whoops) 2019-11-14 22:28:42 -08: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
02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326 
Ports techweb backend refactor & co.
 2019-11-14 16:45:09 -07: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
178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330 
porting "global to static"
 2019-11-14 16:38:27 -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
d6f540faf7 Merge pull request #9796 from Ghommie/Ghommie-cit347 
Unmodularize airlocks.
 2019-11-14 16:24:56 -07:00
kevinz000
bd650e53da Merge pull request #9795 from Ghommie/Ghommie-cit346 
Unmodularize areas.
 2019-11-14 16:24:36 -07:00