Commit Graph

3821 Commits

Author SHA1 Message Date
ShadeAware 2cd6ed5f26 REEEE STRAY SLASHES
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
2020-01-26 16:31:00 -05:00
ShadeAware 732dd8a3bb Hmm, today I will forget quotes on my strings.
Thank you Putnam.
2020-01-26 16:11:22 -05:00
ShadeAware e75807430b Adds Makeshift Sprites and Fancy Sprites; Fancy Crafting
Not actually crafting but you get the idea. This won't compile haha.
2020-01-26 15:53:37 -05:00
ShadeAware f547c8692b Changes all references of "Makeshift" to "Crafted" because im not willing to change the switchblade's fucking SEXY SPRITE
YOU CAN'T MAKE ME DO IT GHOMMIE, THAT IS SOMETHING I WILL NOT COMPROMISE ON.
2020-01-23 16:40:30 -05:00
Ghom 51812ae0ec Proud? No. 2020-01-23 16:33:11 +01:00
ShadeAware fd04469ff0 H 2020-01-23 08:01:28 -05:00
ShadeAware 0b1a0e7286 Update weaponry.dm 2020-01-22 17:54:27 -05:00
ShadeAware 1c4f37b5bf MAKING THE CODE LESS SHIT THANS TO ARTUR AND SUN WUKONG
WHY DID IT TAKE ME SO LONG TO DO THIS THEY LITERALLY SPOONFED ME THE INFORMATION GOD IM SO FUCKING STUPID AND RETARD GOD I FUCKING I FHUHDHJUGDFJTUFUGFUG7F7BGFJKDOKDIVFUBHFB
2020-01-22 17:50:57 -05:00
ShadeAware 08016a8461 Ghommie commands, I obey. 2020-01-20 20:22:09 -05:00
ShadeAware 9f488c80a1 Update weaponry.dm 2020-01-20 18:49:04 -05:00
ShadeAware 6f243f9c44 Update weaponry.dm 2020-01-20 18:08:05 -05:00
ShadeAware ffef7cd4db Update weaponry.dm 2020-01-20 17:33:18 -05:00
Ghom 4c6af66050 Merge pull request #10617 from Citadel-Station-13/kevinz000-patch-16
Grenades can now actually have their timers adjusted
2020-01-20 20:02:06 +01:00
kevinz000 b1cd0f4ede Update grenade.dm 2020-01-19 16:11:49 -07:00
kevinz000 088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
kevinz000 90fcedd188 Update grenade.dm 2020-01-19 13:40:09 -07:00
Ghom 536900a7ac Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
Putnam cc1fcee4ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-19 03:56:41 -08:00
Hatterhat 590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06:00
Ghommie 3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
r4d6 810556cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents 2020-01-18 16:03:49 -05:00
Ghom d709edb1c2 Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
Ghom ce2fc37df3 Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
2020-01-18 20:16:30 +01:00
Ghom 07b3bac674 Merge pull request #10580 from Putnam3145/craft-log
Craft logging
2020-01-18 17:47:31 +01:00
Ghom c00be1a9b1 Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
2020-01-18 17:42:30 +01:00
Putnam 3788bc6676 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-17 21:33:13 -08:00
Ghommie 9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
kevinz000 aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
2020-01-17 15:15:08 -07:00
Tupinambis 22dbd3d265 Nerfs RLDs in general. You know I had to do it to em. 2020-01-17 12:23:13 -06:00
Putnam 5ace1df9af better logging, that also works 2020-01-16 19:09:13 -08:00
Putnam a4cc73f219 some craft logging 2020-01-16 18:40:00 -08:00
r4d6 ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
r4d6 755b0fac3c Merge branch 'master' into Passive-Vents 2020-01-15 19:15:50 -05:00
r4d6 6045d818d8 Add passive vents 2020-01-15 19:12:13 -05:00
Ghom 8a06f2f45c Merge pull request #10499 from Hatterhat/tg-40046
more /tg/station ports - tools! logging! some other fun stuff!
2020-01-15 01:05:36 +01:00
Ghom 5dee355381 Merge pull request #10530 from kappa-sama/modularer
deletes modular items but this time i don't get cucked
2020-01-15 00:47:38 +01:00
Putnam 21dde64da2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa 2020-01-14 03:27:03 -08:00
Hatterhat 464b893790 Merge branch 'master' into tg-40046 2020-01-13 23:06:48 -06:00
Ghommie 1d948907f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-13 23:26:21 +01:00
kappa-sama 3f57f30e14 Merge branch 'master' into modularer 2020-01-13 16:32:00 -05:00
Lin 623ab1c661 Merge pull request #10287 from Ghommie/Ghommie-cit492
Minor captains closet cleanup.
2020-01-13 21:15:42 +00:00
Letter N 6ace5fc4b3 ell eff 2020-01-13 21:19:21 +08:00
Letter N 450cb2b01a Merge branch 'master' into banjo 2020-01-13 20:53:30 +08:00
Putnam c7e3b167e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-12 17:40:26 -08:00
Putnam bb0d012d7a well that works 2020-01-12 16:08:49 -08:00
Ghommie 9dad810edf Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:11:02 +01:00
Ghommie b2ab8959f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:00:05 +01:00
kappa-sama 3e199ed780 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer 2020-01-12 14:23:38 -05:00
kappa-sama 4e3a5379a4 augh 2020-01-12 14:21:06 -05:00
Hatterhat 9aedc62ddb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 12:39:17 -06:00