Commit Graph

732 Commits

Author SHA1 Message Date
zerothebigboy
e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
The0bserver
7e92781e93 Improved Cigarette Case Handling 2021-04-21 11:50:41 -04:00
silicons
9f032df236 Merge pull request #14608 from TheObserver-sys/TheHoldoutUpdate
The Holdout Update: How I learned to stop whining, and aim a pocket pistol.
2021-04-18 18:50:37 -06:00
silicons
02f4bd8f3a Merge pull request #14591 from zeroisthebiggay/deathrattles
ports deathrattle implants but without mob statchange because i am not gonna port that today
2021-04-18 18:48:08 -06:00
The0bserver
c313ba38b8 adds the .38 2021-04-14 01:26:24 -04:00
The0bserver
27c49b3f34 fox fix 2021-04-13 23:38:50 -04:00
The0bserver
64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
The0bserver
1d31fb084f More concealment, fixes a problem with the .45-70 2021-04-11 19:40:54 -04:00
The0bserver
9fe8fb7671 More work 2021-04-11 07:20:06 -04:00
The0bserver
e75088420d Error fixing. 2021-04-11 04:38:46 -04:00
The0bserver
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
zerothebigboy
a7c061392b i hate tg code 2021-04-08 18:05:36 -04:00
silicons
3416989b7c Merge pull request #14552 from BlueWildrose/PillsHere
I could blot the sun out with these titty pills and some certain catgirls here STILL wouldn't be satisfied.
2021-04-08 03:23:32 -06:00
Eric
7a135d2346 Adds Telescopic bat to uplink Baseball bundle. 2021-04-03 17:11:06 -05:00
BlueWildrose
5152a605d8 this is very warming 2021-04-01 11:36:30 -07:00
Blue Wildrose
fcd1080069 more booby and dick pill 2021-04-01 05:36:43 -07:00
Lin
0f5d5522b0 Merge pull request #14431 from YakumoChen/ancient-bundle
Ports Ancient bundle from TG
2021-03-28 18:09:38 -05:00
ItzGabby
68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
DeltaFire
45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
2021-03-17 17:01:47 +01:00
YakumoChen
3aca657c1f Update uplink_kits.dm 2021-03-16 22:03:49 -04:00
YakumoChen
5f30c71321 Update uplink_kits.dm 2021-03-16 22:00:44 -04:00
YakumoChen
757e7b34d7 Update code/game/objects/items/storage/uplink_kits.dm
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-03-16 00:57:56 +00:00
YakumoChen
8484f2f120 adds ancient kit 2021-03-13 03:36:54 +00:00
Hatterhat
d473b271cb uh oh! it's another stupid fucking hatter pr! 2021-03-10 15:06:39 -06:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
dzahlus
f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
SmArtKar
2135a391dc More cards? More cards! 2021-02-04 19:03:03 +03:00
SmArtKar
2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
silicons
fa587e3d1a Merge pull request #14100 from Hatterhat/sheath-exp
twinsheath additions
2021-01-20 15:20:45 -07:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Hatterhat
fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
DeltaFire
3f736aaa36 Merge pull request #13834 from zeroisthebiggay/pogbox
ports the traitor assistant POGBOX that scales damage with tc from /TG/
2021-01-06 19:29:17 +01:00
zeroisthebiggay
b20607cb1a Update toolbox.dm 2021-01-03 20:18:55 -05:00
necromanceranne
0aa5338f9b Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays 2021-01-01 05:42:28 +11:00
zeroisthebiggay
3f36b95f92 a
a
2020-12-23 09:42:10 -05:00
zerothebigboy
dcecd6f03a pogbox 2020-12-21 18:28:52 -05:00
zerothebigboy
cca8dc3a36 pogbox 2020-12-21 18:25:33 -05:00
DeltaFire
8414db5add Merge pull request #13814 from Xantholne/TwinSwordSheath
Fixes twin sword sheaths icon/item state from being blank sprites
2020-12-21 02:20:32 +01:00
Xantholne
1c968e6ebe period equals 2020-12-20 16:00:18 -07:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
Xantholne
a5c14b90c5 Adds missing sheathing sounds 2020-12-18 22:56:30 -07:00
Xantholne
d60d72c7b7 Fixes twin belts
gives item state and icon state to be functional
2020-12-18 22:03:24 -07:00