Razgriz
e3a9cd3775
Merge branch 'master' into upstream-merge-10764
2021-07-03 00:26:13 -07:00
Razgriz
3c2b215c30
powder that makes you say yes
2021-07-02 21:18:21 -07:00
Razgriz
b8ce7ecf84
powder that makes you say yes
2021-07-02 21:15:20 -07:00
Razgriz
b20baeeb9b
Merge pull request #2320 from Verkister/patch-28
...
Earlyport fix for ghosting as admin
2021-07-02 14:34:38 -07:00
Verkister
2db9fd7f18
Update observer.dm
2021-07-02 23:21:25 +03:00
Verkister
95de33684f
Earlyport fix for ghosting as admin
...
The verb got completely broken.
2021-07-02 18:18:02 +03:00
Verkister
0cc9886bd1
Brings back lost unmarked CH edit
...
reverts major conductive being "balanced" to -1 point again.
2021-07-02 17:31:05 +03:00
Nadyr
02947469d7
Merge pull request #2313 from CHOMPStationBot/upstream-merge-10767
...
[MIRROR] Improve E-quip hotkey
2021-07-01 21:31:20 -04:00
Nadyr
8171e7736b
Merge pull request #2303 from CHOMPStationBot/upstream-merge-10775
...
[MIRROR] [MIRROR] Halves Item Slowdown Effects
2021-07-01 21:30:30 -04:00
Nadyr
395ea3fc4b
powder that makes you say yes
2021-07-01 21:15:04 -04:00
Nadyr
8daddfcdb7
powder that makes you say yes
2021-07-01 20:21:06 -04:00
Nadyr
6621fb2deb
powder that makes you say yes
2021-07-01 20:16:16 -04:00
Nadyr
92b75e97fa
powder that makes you say yes
2021-07-01 20:12:33 -04:00
Nadyr
8e64f66f9d
powder that makes you say yes
2021-07-01 20:04:58 -04:00
Nadyr
a0e05931c3
powder that makes you say yes
2021-07-01 20:01:57 -04:00
Nadyr
35ec0f58bf
powder that makes you say yes
2021-07-01 20:00:09 -04:00
Nadyr
646bfd3068
powder that makes you say yes
2021-07-01 19:55:40 -04:00
Nadyr
c6c8babcf5
powder that makes you say yes
2021-07-01 19:53:48 -04:00
Nadyr
161ce3cbd7
powder that makes you say yes
2021-07-01 19:51:34 -04:00
Chompstation Bot
bf04ca9003
Port /tg/ vis_contents openspace
2021-06-30 19:49:25 +00:00
Aronai Sieyes
c77619f520
Merge pull request #10767 from VOREStation/Arokha/EEquip
...
Improve E-quip hotkey
2021-06-30 19:35:59 +00:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Verkister
cbeea3cd22
Properly unlocks shadekin ears
...
An empty list here means nobody can use it
2021-06-30 13:14:09 +03:00
Chompstation Bot
c97b47de72
[MIRROR] Halves Item Slowdown Effects
2021-06-28 11:32:00 +00:00
Razgriz
fa9917de85
Merge pull request #2301 from kcin2001/xenohybrid-bump
...
xeno hunter dome bump
2021-06-28 03:58:16 -07:00
kcin2001
ea1897be79
changed to _ch files
...
i dont want to go upstream really, i really should just put these under ears anyway
2021-06-27 16:23:19 -07:00
Nadyr
0723d37983
Merge pull request #2299 from CHOMPStationBot/upstream-merge-10758
...
[MIRROR] Fixes #10757
2021-06-27 17:05:56 -04:00
Aronai Sieyes
974107d7eb
Merge pull request #10758 from VOREStation/Fixes/10757
...
Fixes #10757
2021-06-27 16:13:27 +00:00
lm40
af32042b15
fixes #10700 ( #10763 )
...
* Update human.dm
* Update robot.dm
* Update simple_hud.dm
2021-06-27 16:10:18 +00:00
Razgriz
3111c1beee
Merge pull request #2294 from kcin2001/shadekin-ears
...
unlock shadekin ears
2021-06-26 13:24:56 -07:00
Razgriz
52d29d42bb
Merge pull request #1955 from CHOMPStationBot/upstream-merge-9969
...
[MIRROR] Adds in Booze hounds.
2021-06-26 13:23:49 -07:00
kcin2001
d5258e7851
unlock shadekin ears
...
allow all species to use shadekin ears again, there too adorable to be hogged by 1 species (they're nice as just 4 fluffy ears)
2021-06-26 01:50:46 -07:00
Razgriz
f5c36c9d60
why did you save that to a VR file bro
2021-06-25 01:28:29 -07:00
Razgriz
7773ef495f
Merge pull request #2277 from CHOMPStationBot/upstream-merge-10270
...
[MIRROR] Add phoron and nitrogen breather traits, and water breather trait
2021-06-25 01:15:29 -07:00
Razgriz
ad1a518c54
Update station_vr.dm
2021-06-25 01:13:29 -07:00
Razgriz
08bad65230
Update dog_sleeper_vr.dm
2021-06-25 01:12:45 -07:00
Razgriz
e576626b35
Update dog_modules_vr.dm
2021-06-25 01:09:50 -07:00
Razgriz
679cfd0e5a
Update dog_sleeper_vr.dm
2021-06-25 00:54:35 -07:00
Razgriz
a1c2000750
Merge pull request #2284 from CHOMPStationBot/upstream-merge-10746
...
[MIRROR] Corrects rabbit typo
2021-06-25 00:36:12 -07:00
Razgriz
534f505200
Merge pull request #2280 from Cyrelius/master
...
Promethean Rebalance
2021-06-25 00:33:38 -07:00
Razgriz
ae3ef479e8
powder that makes you say yes
2021-06-25 00:33:00 -07:00
Razgriz
618ca03c09
powder that makes you say yes
2021-06-24 17:40:51 -07:00
Novacat
0199e8befa
Merge pull request #10746 from foopwo/learnyourcontractions
...
Corrects rabbit typo
2021-06-24 20:46:02 +00:00
Cyrelius
5f938603ba
Merge branch 'CHOMPStation2:master' into master
2021-06-23 19:23:27 -07:00
Cyrelius
eec65f5534
Promethean damage multiplier rebalancing
...
Brings burn multiplier down a more reasonable value and slightly lowers brute multiplier to be more in line with the 1:2 ratio that other servers have. This will make lasers less likely to one-shot prometheans, but will still hurt severely. A shot from a laser rifle should only do 96 damage at this multiplier, still enough to remove a limb, but less likely to send one to crit.
2021-06-23 17:47:39 -07:00
Razgriz
6bd0f11441
Update mob.dm
2021-06-23 16:18:38 -07:00
Chompstation Bot
a424fbaf12
Add phoron and nitrogen breather traits, and water breather trait
2021-06-23 16:36:10 +00:00
Chompstation Bot
fb343cec6c
[MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-22 22:17:02 +00:00
Razgriz
096246abff
Merge pull request #2247 from cadyn/upstream-merge-10476
...
Manual Mirror Vorestation #10476
2021-06-20 17:14:14 -07:00
Razgriz
97b8fd26a7
Update death_vr.dm
2021-06-20 16:22:24 -07:00
