r4d6
|
234e10ffba
|
Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into synth-blacklist
|
2020-10-22 11:46:46 -04:00 |
|
Nadyr
|
c9e6d0c136
|
Merge pull request #727 from CHOMPStationBot/upstream-merge-9125
[MIRROR] Adds Spacer Language
|
2020-10-22 10:26:51 -04:00 |
|
Nadyr
|
d708107893
|
Merge pull request #740 from cadyn/quickarelifix
Quick fix for med tweaks typo or some BS
|
2020-10-22 10:24:16 -04:00 |
|
Nadyr
|
340e1347ba
|
Merge pull request #739 from CHOMPStationBot/upstream-merge-9246
[MIRROR] 13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation
|
2020-10-22 10:23:03 -04:00 |
|
Nadyr
|
7f375ae5ce
|
Merge pull request #738 from CHOMPStationBot/upstream-merge-9247
[MIRROR] [MIRROR] Fixes a runtime when alien syringes are spawned during map loading
|
2020-10-22 10:19:54 -04:00 |
|
Nadyr
|
54f2f80158
|
Merge pull request #735 from CHOMPStationBot/upstream-merge-9148
[MIRROR] 'Closed eyes' markings
|
2020-10-22 10:17:33 -04:00 |
|
Nadyr
|
9c0101106c
|
Merge pull request #731 from CHOMPStationBot/upstream-merge-9203
[MIRROR] Fixes prone turning for tall species
|
2020-10-22 10:15:32 -04:00 |
|
Nadyr
|
8f288011b4
|
Merge pull request #729 from CHOMPStationBot/upstream-merge-9181
[MIRROR] Makes it possible to cancel out of Mass Alteration
|
2020-10-22 10:13:29 -04:00 |
|
Nadyr
|
e4f9635198
|
Merge pull request #728 from CHOMPStationBot/upstream-merge-9173
[MIRROR] Adds Numbing Fangs trait
|
2020-10-22 10:12:32 -04:00 |
|
Nadyr
|
34772675a1
|
Merge pull request #721 from CHOMPStationBot/upstream-merge-9224
[MIRROR] Drink addons and sprites
|
2020-10-22 10:09:11 -04:00 |
|
Nadyr
|
fc677c62e9
|
Merge pull request #725 from CHOMPStationBot/upstream-merge-9220
[MIRROR] [MIRROR] Tesla ball and containment field shock fixes
|
2020-10-22 10:04:24 -04:00 |
|
Nadyr
|
9205e50340
|
Merge pull request #724 from CHOMPStationBot/upstream-merge-9221
[MIRROR] [MIRROR] Make the tesla ball eventually run out of energy
|
2020-10-22 10:03:06 -04:00 |
|
Nadyr
|
6f4897702e
|
Merge pull request #720 from CHOMPStationBot/upstream-merge-9226
[MIRROR] [MIRROR] Fix solar trackers sometimes vanishing when deconstructed
|
2020-10-22 10:00:28 -04:00 |
|
Nadyr
|
343a8188ab
|
Merge pull request #722 from CHOMPStationBot/upstream-merge-9223
[MIRROR] [MIRROR] Fix blood from artifacts breaking the pathogenic isolator
|
2020-10-22 09:54:04 -04:00 |
|
Nadyr
|
63d9df53b8
|
Update solar.dm
Fixes upstream conflicts
|
2020-10-22 09:47:30 -04:00 |
|
Nadyr
|
e1517661ac
|
Merge pull request #714 from CHOMPStationBot/upstream-merge-9234
[MIRROR] [MIRROR] Fixes FBP heatsink not working for teshari
|
2020-10-22 09:30:52 -04:00 |
|
Nadyr
|
2f2df3d6a2
|
Merge pull request #718 from CHOMPStationBot/upstream-merge-9228
[MIRROR] [MIRROR] fix infinite ratburgers
|
2020-10-22 09:27:16 -04:00 |
|
Nadyr
|
0cd523eb50
|
Merge pull request #715 from CHOMPStationBot/upstream-merge-9233
[MIRROR] [MIRROR] Makes the recipe dump take coatings into account
|
2020-10-22 09:19:34 -04:00 |
|
Nadyr
|
395ae5e844
|
Update seromi.dm
Fixes upstream conflicts
|
2020-10-22 09:17:30 -04:00 |
|
Nadyr
|
ae109800e6
|
Merge pull request #713 from CHOMPStationBot/upstream-merge-9240
[MIRROR] [MIRROR] Makes the recipe dump take catalysts into account
|
2020-10-22 09:06:16 -04:00 |
|
Nadyr
|
b2c35bf2b5
|
Merge pull request #712 from CHOMPStationBot/upstream-merge-9087
[MIRROR] Added QOL Firefoam recipie
|
2020-10-22 09:03:00 -04:00 |
|
Nadyr
|
d332792c87
|
Merge pull request #711 from CHOMPStationBot/upstream-merge-9175
[MIRROR] Enables research borgs with exosuit grippers to upgrade/repair borgs, take 2
|
2020-10-22 09:01:19 -04:00 |
|
Nadyr
|
f6f3f0ba17
|
Merge pull request #709 from CHOMPStationBot/upstream-merge-9208
[MIRROR] [MIRROR] Tweaked wall radiation calculation
|
2020-10-22 08:57:09 -04:00 |
|
Nadyr
|
168784188f
|
Merge pull request #708 from CHOMPStationBot/upstream-merge-9209
[MIRROR] [MIRROR] Changes 'Me' Verb to use a proper textbox instead of single-line input.
|
2020-10-22 08:55:58 -04:00 |
|
Nadyr
|
1f9f7c91ae
|
Merge pull request #734 from CHOMPStationBot/upstream-merge-9211
[MIRROR] Fixes dogborg cell lick recharge.
|
2020-10-22 08:51:31 -04:00 |
|
Nadyr
|
e6245d513a
|
Merge pull request #700 from CHOMPStationBot/upstream-merge-9133
[MIRROR] Animated pointing
|
2020-10-22 08:46:35 -04:00 |
|
Cadyn
|
0c96b58f3f
|
Fixing conflict and allowing export chatlog
|
2020-10-21 13:28:59 -07:00 |
|
r4d6
|
0b0f756bce
|
Why it was commented out
|
2020-10-21 13:37:59 -04:00 |
|
r4d6
|
f27f770c30
|
Fix being able to select synth-blacklisted traits
|
2020-10-21 13:37:18 -04:00 |
|
r4d6
|
b577767df5
|
Make Cold-Adapted & Heat-Adapted unable to be taken by synths.
|
2020-10-21 12:15:33 -04:00 |
|
cadyn
|
0f6a462fa1
|
Update Chemistry-Recipes.dm
|
2020-10-20 12:12:38 -07:00 |
|
cadyn
|
04b2e3e44c
|
Fix this bullshit
|
2020-10-20 12:11:34 -07:00 |
|
Chompstation Bot
|
19517fcede
|
13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation
|
2020-10-20 03:19:38 +00:00 |
|
Novacat
|
f6ed4ec93b
|
Merge pull request #9247 from VOREStation/upstream-merge-7734
[MIRROR] Fixes a runtime when alien syringes are spawned during map loading
|
2020-10-20 03:18:25 +00:00 |
|
Razgriz
|
e53b5088a0
|
Merge pull request #706 from CHOMPStationBot/upstream-merge-9232
[MIRROR] [MIRROR] [FIX] Magboot & RIG Contamination/PHORONGUARD Usage
|
2020-10-19 18:12:16 -07:00 |
|
Razgriz
|
946a258f59
|
Merge pull request #703 from CHOMPStationBot/upstream-merge-9237
[MIRROR] [MIRROR] Fixes suit blood overlays on mobs not displaying.
|
2020-10-19 18:08:21 -07:00 |
|
Razgriz
|
cd338a4aa0
|
Merge pull request #701 from CHOMPStationBot/upstream-merge-9112
[MIRROR] Removes single-line input on subtle and emotes, replaces with textbox
|
2020-10-19 18:06:54 -07:00 |
|
Razgriz
|
b40ad0a24e
|
Update mob.dm
|
2020-10-19 18:06:04 -07:00 |
|
Razgriz
|
6d0f977416
|
Merge pull request #699 from CHOMPStationBot/upstream-merge-9241
[MIRROR] [MIRROR] 5 new clothes & 1 headdress
|
2020-10-19 18:03:15 -07:00 |
|
Razgriz
|
ca3f30f96a
|
Merge pull request #584 from cadyn/arelimeds
Areli's med tweaks v2
|
2020-10-19 03:53:36 -07:00 |
|
Verkister
|
17e89fa241
|
Merge pull request #9148 from KillianKirilenko/kk-misc2
'Closed eyes' markings
|
2020-10-19 10:41:16 +00:00 |
|
Verkister
|
d861dbbbf2
|
Merge pull request #9211 from VOREStation/Verkister-patch-3
Fixes dogborg cell lick recharge.
|
2020-10-19 10:41:09 +00:00 |
|
Verkister
|
4c4c22a651
|
Merge pull request #9203 from VOREStation/Verkister-patch-1
Fixes prone turning for tall species
|
2020-10-19 10:40:46 +00:00 |
|
Verkister
|
7c902f6ed6
|
Merge pull request #9181 from Runa-Dacino/NIF-MassAlteration-Option-No
Makes it possible to cancel out of Mass Alteration
|
2020-10-19 10:40:30 +00:00 |
|
Verkister
|
532bcca4a1
|
Merge pull request #9173 from Meghan-Rossi/numbfangs
Adds Numbing Fangs trait
|
2020-10-19 10:40:23 +00:00 |
|
Chompstation Bot
|
6d02d61e54
|
Adds Spacer Language
|
2020-10-19 10:40:15 +00:00 |
|
Verkister
|
68b59b03fb
|
Merge pull request #9220 from VOREStation/upstream-merge-7702
[MIRROR] Tesla ball and containment field shock fixes
|
2020-10-19 10:40:00 +00:00 |
|
Verkister
|
56bd71350b
|
Merge pull request #9221 from VOREStation/upstream-merge-7703
[MIRROR] Make the tesla ball eventually run out of energy
|
2020-10-19 10:39:52 +00:00 |
|
Verkister
|
a47085ef8e
|
Merge pull request #9223 from VOREStation/upstream-merge-7705
[MIRROR] Fix blood from artifacts breaking the pathogenic isolator
|
2020-10-19 10:39:37 +00:00 |
|
Verkister
|
d8ddcb3026
|
Merge pull request #9224 from rboys2/clara-dev-more-drinks
Drink addons and sprites
|
2020-10-19 10:39:29 +00:00 |
|