Commit Graph

12120 Commits

Author SHA1 Message Date
Razgriz
c3f2a033f6 Merge pull request #1300 from LunarFleet/buzzbuzz
Tesh wings/tails/antenna time
2021-02-14 18:09:53 -07:00
Nadyr
6a508b927f Merge pull request #1298 from CHOMPStationBot/upstream-merge-9680
[MIRROR] [MIRROR] Ports World Server Hair & Gradients
2021-02-14 07:39:56 -05:00
Nadyr
70f0723347 Merge pull request #1299 from CHOMPStationBot/upstream-merge-9688
[MIRROR] Fixes accessories not getting applied on spawn
2021-02-14 07:38:33 -05:00
Nadyr
86ee114f9a Merge pull request #1297 from CHOMPStationBot/upstream-merge-9193
[MIRROR] Adds more fun say lines to wolfgirl, also removes old redundant code.
2021-02-14 07:06:37 -05:00
Razgriz
aff75407f9 Merge pull request #1286 from CHOMPStationBot/upstream-merge-9678
[MIRROR] [MIRROR] Makes slimes not reproduce in unlimited stacks
2021-02-13 16:02:41 -07:00
Razgriz
696d1a10ca Merge pull request #1281 from CHOMPStationBot/upstream-merge-9675
[MIRROR] Possibly fixes simplemob bad del runtime spam
2021-02-13 15:53:55 -07:00
Razgriz
ebe5c88699 Merge pull request #1273 from CHOMPStationBot/upstream-merge-9543
[MIRROR] [MIRROR] Space cleaner cleans mobs
2021-02-13 15:52:23 -07:00
Razgriz
9ee3e4d897 Merge pull request #1252 from CHOMPStationBot/upstream-merge-9645
[MIRROR] The clime offices
2021-02-13 15:14:02 -07:00
Razgriz
51959589da Merge pull request #1267 from CHOMPStationBot/upstream-merge-9662
[MIRROR] Better names and descriptions for new scale traits.
2021-02-12 23:06:13 -07:00
Razgriz
34597b9f03 Merge pull request #1263 from Sharkmare/patch-1
Toggleable auto laugh for demons + changeable laugh tracks
2021-02-12 23:05:56 -07:00
Razgriz
1dd326a86c Merge pull request #1269 from CHOMPStationBot/upstream-merge-9664
[MIRROR] Fixes shape traits not updating visuals on spawn
2021-02-12 22:59:47 -07:00
Razgriz
0335b5da0f Merge pull request #1187 from CHOMPStationBot/upstream-merge-9609
[MIRROR] Chopped up the wideborg files.
2021-02-12 20:21:26 -07:00
Razgriz
6f257b053b Merge pull request #1259 from BlackMajor/vore-fix
Vore optimization and some
2021-02-12 20:21:05 -07:00
Razgriz
a78f3bff59 Update station_vr.dm 2021-02-11 22:38:12 -07:00
LunarFleet
ec50a7f361 Lower Nadyr's blood pressure 2021-02-11 23:44:43 -05:00
LunarFleet
2bb88c9b17 Update neutral_ch.dm 2021-02-11 23:42:52 -05:00
LunarFleet
dec72e5b41 Tesh wings/tails/antenna time 2021-02-11 23:34:21 -05:00
Verkister
f9906535e7 Merge pull request #9688 from VOREStation/Verkister-patch-8
Fixes accessories not getting applied on spawn
2021-02-11 20:58:57 +00:00
Verkister
c1b7bb1da5 Merge pull request #9680 from VOREStation/upstream-merge-7861
[MIRROR] Ports World Server Hair & Gradients
2021-02-11 13:57:14 +00:00
Verkister
2c19dd0551 Merge pull request #9193 from Sebbe9123/WolfgirlUpdoot
Adds more fun say lines to wolfgirl, also removes old redundant code.
2021-02-11 13:29:39 +00:00
Novacat
3557c72c63 Merge pull request #9678 from VOREStation/upstream-merge-7857
[MIRROR] Makes slimes not reproduce in unlimited stacks
2021-02-10 23:20:45 +00:00
Verkister
58f8bb8cae Merge pull request #9675 from VOREStation/Verkister-patch-8
Possibly fixes simplemob bad del runtime spam
2021-02-10 09:40:54 +00:00
Verkister
3e2d6f6f76 Merge pull request #9543 from VOREStation/upstream-merge-7802
[MIRROR] Space cleaner cleans mobs
2021-02-09 18:18:03 +00:00
Novacat
6075cf27a0 Merge pull request #9664 from VOREStation/Verkister-patch-8
Fixes shape traits not updating visuals on spawn
2021-02-09 17:45:00 +00:00
Novacat
8878941b11 Merge pull request #9662 from Heroman3003/better-wide-names
Better names and descriptions for new scale traits.
2021-02-09 17:44:45 +00:00
Sharkmare
d0730ebf37 Updating comments 2021-02-09 06:28:27 +01:00
Sharkmare
67f9516cd2 Adding feedback to manual laughing for the user 2021-02-09 06:25:33 +01:00
Sharkmare
c184261a57 Restructure toggle
Everything works but returning to_chat seems to not display a message, this should fix that
2021-02-09 06:12:11 +01:00
Razgriz
5c7d335e2b Revert "Revert #1240" 2021-02-08 17:36:28 -07:00
Sharkmare
6dac403cf6 Adds a laugh toggle and a manual laugh verb 2021-02-08 22:16:16 +01:00
Sharkmare
195108a2a7 Fix overlooked space
I removed all spaces and made em to tabs instead, apparetly i missed a space, woops
2021-02-08 21:49:59 +01:00
Sharkmare
f4ab2268f2 Toggleable auto laugh for demons + ez change laugh track
Addresses #1241
2021-02-08 21:42:48 +01:00
BlackMajor
c1bf8edaa6 some vore fixes 2021-02-08 22:01:29 +13:00
Chompstation Bot
69e712d103 The clime offices 2021-02-08 00:36:14 +00:00
Razgriz
7313c4c3de Revert Size traits #1240
#1240
2021-02-07 16:50:01 -07:00
Razgriz
314cf6f99f Revert #1240
Revert #1240
2021-02-07 16:48:10 -07:00
cadyn
f3075eec21 wait istype should work more robustly here 2021-02-07 12:41:46 -08:00
cadyn
6818ee98df Sanity check on loneliness traits
Just adding a sanity check to prevent some runtimes
2021-02-07 12:40:00 -08:00
Razgriz
c446790d4f Merge pull request #1234 from cadyn/ballistics-v4
Ballistics v4
2021-02-06 22:59:44 -07:00
Razgriz
0869bf3824 Merge pull request #1244 from CHOMPStationBot/upstream-merge-9648
[MIRROR] Neuters Ambers
2021-02-06 18:11:09 -07:00
Novacat
af2a6c4baf Merge pull request #9648 from VOREStation/Verkister-patch-8
Neuters Ambers
2021-02-07 00:28:57 +00:00
cadyn
58e84bc354 Update neutral.dm 2021-02-06 07:26:46 -08:00
Chompstation Bot
d1e1c62d1d Adds body shape traits and proper preview scaling 2021-02-05 21:09:43 +00:00
Razgriz
8bf292d9c5 Merge pull request #1235 from Shadowfire117/ExtraMas
quick fix
2021-02-04 14:25:21 -07:00
Shadowfire
e0f0261727 quick fix
spelling errors, bleh
2021-02-04 21:30:10 +01:00
Cadyn
d93a3dac65 Ballistics v4 2021-02-04 01:56:16 -08:00
Razgriz
e15b227727 Merge pull request #1231 from CHOMPStationBot/upstream-merge-9639
[MIRROR] Fixes nontaur clipping
2021-02-03 09:56:24 -07:00
Razgriz
02b4e274ce Merge pull request #1232 from Shadowfire117/ExtraMas
Shadyboi
2021-02-03 09:54:49 -07:00
Shadowfire
6716f5a01d Shadyboi
Redacted
2021-02-03 17:37:07 +01:00
Novacat
a90aecfd90 Merge pull request #9639 from VOREStation/Verkister-patch-8
Fixes nontaur clipping
2021-02-03 14:40:17 +00:00