keronshb
|
f1ca283318
|
Merge branch 'master' into familyport
|
2022-02-11 14:04:57 -05:00 |
|
DeltaFire
|
6224da71a3
|
contents_explosion
at least this one had less overrides.
|
2021-11-14 21:41:42 +01:00 |
|
keronshb
|
9153115566
|
Merge remote-tracking branch 'upstream/master' into familyport
|
2021-11-05 10:50:08 -04:00 |
|
silicons
|
186b552103
|
merge
|
2021-10-29 21:50:58 -07:00 |
|
keronshb
|
8978ee10fe
|
Merge remote-tracking branch 'upstream/master' into familyport
|
2021-10-28 14:41:46 -04:00 |
|
Letter N
|
bcdf96f274
|
Revert "TGUI alerts, lists, inputs"
|
2021-10-28 12:17:29 +08:00 |
|
keronshb
|
41013ec815
|
Part 2 - Missing stuff from original families port
|
2021-10-12 12:07:02 -04:00 |
|
SandPoot
|
5aa12b4716
|
There's a bounty for this right? i spent nearly two full days at this
|
2021-10-05 18:10:32 -03:00 |
|
WanderingFox95
|
83987db48a
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-10-01 18:51:46 +02:00 |
|
silicons
|
5ff4a2ace5
|
Merge pull request #15180 from LetterN/achives-
Achivement & Clowncar update
|
2021-09-28 00:15:52 -07:00 |
|
WanderingFox95
|
fe8a652689
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-09-19 21:32:03 +02:00 |
|
LetterN
|
0b7e514739
|
t
|
2021-09-19 14:05:28 +08:00 |
|
zerothebigboy
|
3c60632312
|
spiteful
|
2021-09-14 11:01:20 -04:00 |
|
zerothebigboy
|
68e2eb1d7a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
|
2021-09-10 12:12:57 -04:00 |
|
zerothebigboy
|
ccfde52b0d
|
code
|
2021-09-02 23:45:03 -04:00 |
|
zerothebigboy
|
30134a0d2f
|
cool
|
2021-09-01 06:32:33 -04:00 |
|
zerothebigboy
|
0e95e1a8ad
|
cool
|
2021-09-01 05:14:17 -04:00 |
|
WanderingFox95
|
f68548fb24
|
Expands Hunter's Belts a little
|
2021-07-20 18:48:28 +02:00 |
|
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 |
|