 Enric Gabriel
|
6da5ecffbc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-27 14:23:35 -03:00 |
|
|
zerothebigboy
|
ef720c3481
|
a
|
2020-07-27 01:37:56 -04:00 |
|
|
zerothebigboy
|
df31d90c1b
|
a
|
2020-07-27 01:37:47 -04:00 |
|
|
zerothebigboy
|
9fbcd21af6
|
a
|
2020-07-27 00:36:38 -04:00 |
|
|
zerothebigboy
|
e30a60d0ba
|
a
|
2020-07-26 23:42:40 -04:00 |
|
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
|
siliconsandGitHub
|
c4ec1dfdc1
|
Update neck.dm
|
2020-07-24 20:50:52 -07:00 |
|
|
siliconsandGitHub
|
c3be76b529
|
Update neck.dm
|
2020-07-24 19:32:51 -07:00 |
|
|
Enric Gabriel
|
e0fdf3dce9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts
|
2020-07-23 19:14:58 -03:00 |
|
|
LinandGitHub
|
6fca9af0ed
|
Merge pull request #12848 from silicons/morecolors
species customization now allows 16 million colors instead of 4 thousand
|
2020-07-23 13:28:50 -05:00 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
Enric Gabriel
|
36970c378b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-22 12:06:12 -03:00 |
|
|
siliconsandGitHub
|
744b6d6b48
|
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
|
2020-07-21 19:20:52 -07:00 |
|
|
zerothebigboy
|
fb35248e3b
|
a
|
2020-07-21 02:24:22 -04:00 |
|
|
Enric Gabriel
|
f0904c6b10
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-21 01:19:25 -03:00 |
|
|
silicons
|
87d53957bf
|
sigh
|
2020-07-20 20:09:13 -07:00 |
|
|
siliconsandGitHub
|
267186a5d3
|
Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
|
2020-07-20 16:15:38 -07:00 |
|
|
silicons
|
526d257410
|
fix
|
2020-07-20 11:48:08 -07:00 |
|
|
silicons
|
416b989e12
|
changes
|
2020-07-20 11:35:10 -07:00 |
|
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
|
Enric Gabriel
|
7a1d5acd9c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 - may FUCK
|
2020-07-19 18:58:33 -03:00 |
|
|
LinandGitHub
|
ba3dc6a73b
|
Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
|
2020-07-18 17:02:02 -05:00 |
|
|
Enric Gabriel
|
432cb077ba
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-17 23:09:00 -03:00 |
|
|
siliconsandGitHub
|
044525519a
|
Merge pull request #12750 from timothyteakettle/loadout-plushies
replaces plushies in the loadout menu with a choice box
|
2020-07-17 17:10:14 -07:00 |
|
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
|
Enric Gabriel
|
90f2e58f47
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-15 17:13:32 -03:00 |
|
|
DeltaFire
|
ac2dd85743
|
runtime fixies
|
2020-07-14 18:25:13 +02:00 |
|
|
Timothy Teakettle
|
c3d490a803
|
very cool
|
2020-07-12 20:15:57 +01:00 |
|
|
Enric Gabriel
|
3cba98b3ff
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-08 21:31:37 -03:00 |
|
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
|
Ghommie
|
e12c3382de
|
undefined variable.
|
2020-07-05 03:48:41 +02:00 |
|
|
Ghommie
|
562b57095d
|
mowing down the experimental cloner copypasta.
|
2020-07-05 03:04:53 +02:00 |
|
|
Enric Gabriel
|
961a217691
|
holy shit, there's so much stuff here, so... idk exactly what it does
|
2020-07-04 21:39:32 -03:00 |
|
|
Enric GabrielandGitHub
|
ad48e8a05c
|
the interactions (#20)
|
2020-07-04 17:04:58 -03:00 |
|
|
Cirno
|
020da9fa07
|
i hope this works
|
2020-07-04 15:47:38 -03:00 |
|
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
|
GhomandGitHub
|
b280c0f550
|
Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
|
2020-06-29 21:13:06 +02:00 |
|
|
LinandGitHub
|
1966c6daca
|
Merge pull request #12595 from silicons/squish
*squish
|
2020-06-29 13:11:38 -05:00 |
|
|
GhomandGitHub
|
a749dab2b2
|
Merge pull request #12623 from Citadel-Station-13/silicons-patch-7
i would appreciate it if outgoing mentorpms didn't sear my eyes out of my head
|
2020-06-29 19:30:49 +02:00 |
|
|
siliconsandGitHub
|
90e9a647ed
|
Update mentorpm.dm
|
2020-06-26 22:39:17 -07:00 |
|
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
|
b1tt3r1n0
|
38153a2cbe
|
Fuck abuse of mechanics, fermi chem edition.
|
2020-06-25 21:20:58 -04:00 |
|
|
Funce
|
669120ee72
|
Add proper deletion to mentor SQL queries
|
2020-06-25 09:05:09 +12:00 |
|
|
silicons
|
800825f9f7
|
squish
|
2020-06-24 11:02:47 -07:00 |
|
|
siliconsandGitHub
|
9f6d0ba10b
|
Merge pull request #12570 from NopemanMcHalt/orvilike_bonus
Adds Kepi and Orvilike Kepi
|
2020-06-24 08:43:03 -07:00 |
|
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
|
Anonymous
|
9e7b884e86
|
Adds remaining TOSOrvikepi
|
2020-06-21 13:25:23 +03:00 |
|
|
Anonymous
|
45dab7fa66
|
Kepi and Orvilike Kepi
|
2020-06-20 22:52:33 +03:00 |
|
|
kevinz000
|
78fadafa05
|
alright
|
2020-06-17 21:44:49 -07:00 |
|