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

10626 Commits

Author SHA1 Message Date
BlackMajor 6a7a121d56 Merge pull request #8856 from Citadel-Station-13/magrifles_again 
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
 2019-10-28 16:47:02 +13:00
BlackMajor 5ed6de4e26 Merge pull request #9639 from Ghommie/Ghommie-cit283 
Quickfixing hypospray missin icons.
 2019-10-28 16:30:36 +13:00
deathride58 c1742c0572 applies ghommie's suggested change 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-10-27 20:41:44 -04:00
Ghommie 13e06cdef3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit244 2019-10-28 01:37:10 +01:00
Ghommie 9f0e534a55 only add once. 2019-10-28 01:26:41 +01:00
kevinz000 84c15af767 Merge pull request #9590 from Ghommie/Ghommie-cit260 
Ports "All font size spans scale" and cleans up the many browserOutput stylesheets
 2019-10-27 17:22:35 -07:00
kevinz000 329f86cea0 Merge pull request #9612 from Linzolle/blood-overlay-again 
fix blood overlays again
 2019-10-27 17:21:55 -07:00
Ghommie 96e20f4769 fixing one mistake, and it's ready. 2019-10-28 01:04:31 +01:00
Linzolle 24e5905c38 fuck 2019-10-27 19:02:26 -05:00
Ghommie 2d8e383b9c Quickfixing hypospray missin icons. 2019-10-28 00:52:47 +01:00
Ghommie 80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
kevinz000 fae47c58ed Merge pull request #9635 from Thalpy/JacqFixes 
[Expedite] [Halloween] A few fixes for Jacqueline and Barth.
 2019-10-27 16:41:06 -07:00
kevinz000 da387bfdf4 Merge pull request #9620 from YakumoChen/proto_beanbag 
Adds Beanbag Slugs to Seclathe
 2019-10-27 16:13:31 -07:00
kevinz000 e583412388 Merge pull request #9480 from Poojawa/access-clarifications 
Clarifies ID Console descriptions
 2019-10-27 16:13:16 -07:00
kevinz000 309cf531aa Merge pull request #9627 from Ghommie/Ghommie-cit279 
Unmodularize MkII hyposprays and other reagent items sprites.
 2019-10-27 16:09:04 -07:00
kevinz000 d67b7f620d Merge pull request #9613 from Linzolle/hat-toss 
Port hat tossing
 2019-10-27 16:08:00 -07:00
Thalpy 0fabd72087 Barth you fusspot 2019-10-27 22:40:45 +00:00
Thalpy 6de94a23c0 Oops 2019-10-27 22:32:47 +00:00
Thalpy c30f550274 Well here it is 2019-10-27 22:29:35 +00:00
Linzolle bdd553d4f7 thanks ghom 2019-10-27 17:26:55 -05:00
Thalpy a76ff4efe6 Alright 2019-10-27 19:24:23 +00:00
Thalpy 739de1b378 Fixes 2019-10-27 19:07:06 +00:00
Ghommie 4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Anonymous 203509b405 Poll said its DAB 2019-10-27 16:27:03 +03:00
Anonymous d99f0afc0a Merge branch 'master' into assu 2019-10-27 16:08:01 +03:00
Trilbyspaceclone db19eae0f8 Apply suggestions from code review 
Grammar

Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
 2019-10-27 08:44:46 -04:00
kevinz000 dabfba8a0d Merge pull request #9619 from BlackMajor/Yote 
Buffs engiborg build potential
 2019-10-27 05:38:50 -07:00
kevinz000 8f7270ea3e Update medbot.dm 2019-10-27 05:33:12 -07:00
BlackMajor a7ecaaf977 Ok but what if light replacer 2019-10-27 15:58:51 +13:00
TrilbySpaceClone 63cb466360 MK II 2019-10-26 18:59:34 -04:00
Ghommie bf92aa2ffb Unmodularize MkII hyposprays and other reagent items sprites. 2019-10-26 19:14:28 +02:00
Ghommie c0130467db Unmodularize space kiwis and banana spiders. 2019-10-26 18:15:02 +02:00
Anonymous 11ff7802bb Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
 2019-10-26 18:06:56 +03:00
Trilbyspaceclone d9babbd97b fuck god mode 2019-10-26 09:16:29 -04:00
YakumoChen 325de79b3a adds beanbag slug to starter node 2019-10-26 10:22:50 +00:00
YakumoChen 0845c6915e adds beanbag to sec lathe 2019-10-26 10:19:01 +00:00
BlackMajor f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13:00
Poojawa 4820efd047 Merge branch 'master' into access-clarifications 2019-10-25 22:24:56 -05:00
deathride58 8f479492db Merge pull request #9513 from Citadel-Station-13/kevinz000-patch-98 
medibots are now TOXINLOVER (so slimes) friendly
 2019-10-25 23:17:30 -04:00
nik707 b324b8bd51 Merge pull request #9408 from Citadel-Station-13/kevinz000-patch-89 
adminhelp tickets now show the names of admins who use resolve actions on them
 2019-10-25 22:16:27 -05:00
deathride58 53fe02e2fc Merge pull request #9539 from Citadel-Station-13/kevinz000-patch-100 
TALLY HO! (adds claymores to the uplink)
 2019-10-25 23:16:09 -04:00
nik707 187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1 
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
 2019-10-25 22:16:02 -05:00
kevinz000 daf4acbceb Merge pull request #9599 from Ghommie/Ghommie-cit264 
Ports "New Revenant icons"
 2019-10-25 20:13:05 -07:00
kevinz000 49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267 
Unmodularize lavaknights and emags.
 2019-10-25 20:12:35 -07:00
kevinz000 275ecbf468 Merge pull request #9604 from Ghommie/Ghommie-cit268 
Unmodularize job types
 2019-10-25 20:10:39 -07:00
kevinz000 4eca1ca5ad Merge pull request #9605 from Ghommie/Ghommie-cit269 
Unmodularize vox sounds
 2019-10-25 20:09:52 -07:00
kevinz000 8b22c95479 Merge pull request #9606 from Ghommie/Ghommie-cit270 
Unmodularize research.
 2019-10-25 20:09:26 -07:00
kevinz000 9b7b2ce0b2 Merge pull request #9607 from Ghommie/Ghommie-cit271 
Unmodularize events
 2019-10-25 20:07:48 -07:00
Trilbyspaceclone f983db61bf Update halloween.dm 2019-10-25 18:08:33 -04:00
Linzolle 5bafab9447 missing period 2019-10-25 16:34:32 -05:00