 BongaTheProto
|
2d1d665e41
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
|
2023-12-16 10:48:35 -05:00 |
|
|
BongaTheProto
|
5afdd65bdb
|
Revert "followup"
This reverts commit 32b361c846.
|
2023-12-16 10:48:30 -05:00 |
|
|
BongaTheProto
|
32b361c846
|
followup
|
2023-12-15 18:38:06 -05:00 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPootandGitHub
|
1f73140a48
|
Merge pull request #359 from Sandstorm-Station/blacklist-check
Prevents buttons from showing on interaction menu if your mob type is blacklisted
|
2023-12-12 22:19:58 -03:00 |
|
|
SandPoot
|
97dd684c51
|
fix
|
2023-12-12 22:12:47 -03:00 |
|
|
SandPoot
|
aeabd21ed5
|
push
|
2023-12-12 22:00:26 -03:00 |
|
|
SandPoot
|
d71ae369d6
|
reorganizes flags to be alphabetical
|
2023-12-11 15:23:53 -03:00 |
|
|
SandPoot
|
45c3f86ce4
|
push
|
2023-12-10 22:50:02 -03:00 |
|
|
SandPoot
|
2428e642bf
|
all of those already inherit from /datum/interaction, unless they're anywhere not 1, i won't allow
|
2023-12-09 21:18:40 -03:00 |
|
|
SandPoot
|
bfc964b76b
|
do you know the definition of insanity
|
2023-12-09 20:27:19 -03:00 |
|
|
BongaTheProtoandGitHub
|
6872017f1d
|
Merge pull request #1009 from ariaworld/spooktober-update
[SEMI-MODULAR] Small Spooktober update (In November)
|
2023-12-08 20:28:44 -05:00 |
|
|
BongaTheProto
|
700fd57efb
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-08 20:22:05 -05:00 |
|
|
SandPoot
|
9cce1aa7ba
|
only update mob if wearing it
|
2023-12-04 16:18:18 -03:00 |
|
|
SandPoot
|
02b9c5ff94
|
things
|
2023-12-04 16:09:59 -03:00 |
|
|
ariaworld
|
e1e419b2c3
|
Restore old loadout cost non-modular
|
2023-11-23 01:07:00 +01:00 |
|
|
ariaworld
|
b329192691
|
Modularize lewd decals!
|
2023-11-19 03:10:02 +01:00 |
|
|
ariaworld
|
70f8ca22d8
|
Remove: Old return TRUE statement.
|
2023-11-18 18:17:30 +01:00 |
|
|
ariaworld
|
1f463a734c
|
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
|
2023-11-17 23:26:33 +01:00 |
|
|
ariaworld
|
e98019e91e
|
Push, push, push.
|
2023-11-17 21:34:27 +01:00 |
|
|
BongaTheProtoandGitHub
|
de5e1e7611
|
Merge pull request #981 from ariaworld/lewd-smallupdate
[Lewd] [Semi-Modular] - Human Erect Penis and Balls Sprites-Fix & More!
|
2023-11-06 15:06:15 -05:00 |
|
|
BongaTheProto
|
37bbecefb4
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-05 18:01:32 -05:00 |
|
|
SandPoot
|
9dcb996901
|
additional
|
2023-11-04 01:11:52 -03:00 |
|
|
SandPoot
|
3bb6783438
|
content
|
2023-11-03 21:17:22 -03:00 |
|
|
ariaworld
|
d8a726e4dd
|
Lewd verbs spelling. (Note some verbs are without periods because they default to it)
|
2023-10-23 22:32:45 +02:00 |
|
|
ariaworld
|
cf406724d6
|
Climax positive mood lasts more, less sex verb cooldown.
|
2023-10-23 22:28:01 +02:00 |
|
|
BongaTheProto
|
604b8ea867
|
Merge remote-tracking branch 'upstream/master' into hate-upstream
|
2023-10-20 22:29:47 -05:00 |
|
|
SandPoot
|
f12f8fc2f2
|
ye
|
2023-10-20 18:04:16 -03:00 |
|
|
SandPoot
|
2c4ff7b448
|
trailing newline
|
2023-10-20 17:55:09 -03:00 |
|
|
SandPoot
|
3aa3aead3d
|
re-do the whole goddamn thing.
|
2023-10-20 17:48:13 -03:00 |
|
|
Марк
|
73e33a788e
|
Choosable Laws.
|
2023-10-20 16:43:14 +05:00 |
|
|
BongaTheProto
|
ff03181384
|
Merge branch 'master' into hate-upstream
|
2023-10-18 22:02:36 -05:00 |
|
|
BongaTheProtoandGitHub
|
4d5b5f6bc6
|
Merge pull request #963 from Kuki-kono/master
Fix Gladiator Infinite Shield Bug
|
2023-10-12 13:55:33 -05:00 |
|
|
BongaTheProto
|
3230992305
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-12 13:28:32 -05:00 |
|
|
SandPoot
|
ee163aae68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-12 02:40:12 -03:00 |
|
|
BongaTheProto
|
dca4dab806
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-10 21:58:50 -05:00 |
|
|
SandPoot
|
41671a5f22
|
quick dmapi stuff update
|
2023-10-10 18:30:48 -03:00 |
|
|
BongaTheProto
|
7b5ecc7b49
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-07 23:28:42 -05:00 |
|
|
SandPootandМарк
|
bcbecabf74
|
push
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
|
2023-10-06 01:11:28 -03:00 |
|
|
SandPoot
|
73b90c8ac3
|
make sure to change stuff on our side
|
2023-10-05 22:01:37 -03:00 |
|
|
BongaTheProto
|
cd026aaddb
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-05 13:38:12 -05:00 |
|
|
SandPoot
|
b7af940a28
|
fix lack of message for special cases
|
2023-10-04 13:35:50 -03:00 |
|
|
SandPoot
|
e46983c7b7
|
no renaming
|
2023-10-03 22:37:41 -03:00 |
|
|
SandPoot
|
90677d70db
|
avoid overriding the upstream code
|
2023-10-03 22:27:12 -03:00 |
|
|
SandPoot
|
e153f780e5
|
actually not needed now
|
2023-10-03 20:57:13 -03:00 |
|
|
SandPoot
|
62c6b6881d
|
ACTUALLY BAD, IT'S INHERITING FROM THE OTHER LIZARD!
|
2023-10-02 23:12:50 -03:00 |
|
|
SandPoot
|
db926e7cb1
|
not needed
|
2023-10-02 22:58:43 -03:00 |
|
|
SandPoot
|
cd12c202c4
|
updates, modularizing and generally making the code better
|
2023-10-02 22:53:21 -03:00 |
|
|
Марк
|
e8c0eaa1c1
|
Plushies.
|
2023-10-03 04:04:54 +05:00 |
|
|
BongaTheProto
|
83918aa030
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-28 14:08:02 -05:00 |
|