Artur
bc30fb7710
Hard resets _maps to master
2020-06-16 16:09:05 +03:00
Artur
5df0cbfc40
Manual mapedit
2020-06-16 02:29:05 +03:00
Artur
d22520d621
chmod permission fixes for travis
2020-06-16 02:01:44 +03:00
Artur
ae7aea43b2
Annoying map shjit
2020-06-16 01:37:25 +03:00
Artur
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
Artur
86331912e7
Fucking vr sleeper aaa
2020-06-16 01:18:59 +03:00
CitadelStationBot
1d3cad02ef
Automatic changelog generation for PR #12521 [ci skip]
2020-06-15 14:07:17 -05:00
Lin
106a79d50b
Merge pull request #12521 from Citadel-Station-13/kevinz000-patch-21
...
Tackle "crit fail" now only gives a lobotomy class leg paralysis instead of magic/unremovable
2020-06-15 14:07:13 -05:00
CitadelStationBot
cb9bb35823
Automatic changelog generation for PR #12520 [ci skip]
2020-06-15 14:06:35 -05:00
Lin
898b0b6337
Merge pull request #12520 from Citadel-Station-13/kevinz000-patch-20
...
Lobotomy can no longer give magic resilience traumas
2020-06-15 14:06:32 -05:00
Lin
9e4081ddca
Merge pull request #12522 from Citadel-Station-13/kevinz000-patch-22
...
Gets rid of a useless file
2020-06-15 14:04:50 -05:00
CitadelStationBot
b215c5ed1f
Automatic changelog generation for PR #12518 [ci skip]
2020-06-15 13:59:44 -05:00
Lin
fd662047f3
Merge pull request #12518 from kevinz000/pp_fix
...
refactors projectile ricochet and fixes a runtime with projectile motion
2020-06-15 13:59:41 -05:00
CitadelStationBot
1683829a21
Automatic changelog generation for PR #12393 [ci skip]
2020-06-15 01:06:47 -05:00
CitadelStationBot
c054b55d98
Automatic changelog generation for PR #12375 [ci skip]
2020-06-15 01:06:09 -05:00
Trilbyspaceclone
d7fd26c2a9
Moves decal painting from BEPIS into venders ( #12393 )
...
* Update bepis.dm
* Update assist.dm
* Update engivend.dm
* Update youtool.dm
2020-06-14 23:04:51 -07:00
Ghom
7513e032e3
petrification improvements ( #12375 )
...
* petrification improvements
* Standards.
2020-06-14 23:04:12 -07:00
CitadelStationBot
8ee2f46ca2
Automatic changelog generation for PR #12509 [ci skip]
2020-06-15 01:02:26 -05:00
Timothy Teakettle
6798699b18
slimes can change their body color using alter form ( #12509 )
...
* let slimes change their color!
* fix
* let them change hair colour
* Revert "let them change hair colour"
This reverts commit 561bc3d06733fcfee2bae5be819c5a3e57bfc89d.
2020-06-14 23:02:23 -07:00
CitadelStationBot
a436692b4e
Automatic changelog generation for PR #12523 [ci skip]
2020-06-15 00:51:36 -05:00
Timothy Teakettle
5df4931266
fix food cart ( #12523 )
2020-06-14 22:50:16 -07:00
Changelogs
4863c8f467
Automatic changelog compile [ci skip]
2020-06-15 00:07:49 +00:00
CitadelStationBot
c7f6393bda
Automatic changelog generation for PR #12516 [ci skip]
2020-06-14 14:54:33 -05:00
Lin
47adbd3e90
Merge pull request #12516 from kevinz000/vv_fix
...
Fixes VV not allowing proper access to datums in associative lists. Upgrades SDQL2 printout for the 3rd? 4th? 5th? time
2020-06-14 14:54:29 -05:00
CitadelStationBot
0570d5321e
Automatic changelog generation for PR #12502 [ci skip]
2020-06-14 14:37:15 -05:00
Lin
894e6c7459
Merge pull request #12502 from kevinz000/shaps_is_once_again_based
...
Port - Lets you tape knives to cleanbots. You know, if you really want to. #47590/tgstation/Ryll-Ryll
2020-06-14 14:37:10 -05:00
CitadelStationBot
cc3005cecd
Automatic changelog generation for PR #12515 [ci skip]
2020-06-14 14:36:07 -05:00
Lin
923cb248d2
Merge pull request #12515 from kevinz000/roomba
...
Zoombas
2020-06-14 14:36:03 -05:00
CitadelStationBot
21f983c182
Automatic changelog generation for PR #12519 [ci skip]
2020-06-14 14:29:23 -05:00
Lin
bd50f3a143
Merge pull request #12519 from Citadel-Station-13/kevinz000-patch-19
...
fixes plushies sprite loading
2020-06-14 14:29:19 -05:00
Changelogs
065ca5d2fa
Automatic changelog compile [ci skip]
2020-06-14 00:08:42 +00:00
kevinz000
fd076ec7bb
Update cleanbot.dm
2020-06-13 16:19:32 -07:00
kevinz000
f2e905cb83
Update lobotomy.dm
2020-06-13 16:06:18 -07:00
kevinz000
433b42957c
Update severe.dm
2020-06-13 14:14:00 -07:00
kevinz000
6bfdb762d4
Update tackle.dm
2020-06-13 14:13:01 -07:00
kevinz000
398651626d
Update plushes.dm
2020-06-13 13:31:33 -07:00
kevinz000
db9a96a4ed
webedit moment
2020-06-13 13:24:28 -07:00
kevinz000
c2d0763aac
Update defines.txt
2020-06-13 13:21:53 -07:00
kevinz000
b81b2bc044
Delete plushie_config.txt
2020-06-13 13:21:13 -07:00
kevinz000
6230e11f16
Update plushes.dm
2020-06-13 13:19:32 -07:00
kevinz000
2544f6c5a4
Update severe.dm
2020-06-13 13:17:16 -07:00
kevinz000
49feb22b4d
Update tackle.dm
2020-06-13 13:15:53 -07:00
kevinz000
9229c1dc0d
Update lobotomy.dm
2020-06-13 13:12:54 -07:00
kevinz000
278dfab74a
Update plushes.dm
2020-06-13 13:10:14 -07:00
kevinz000
8162303bad
Merge remote-tracking branch 'citadel/master' into pp_fix
2020-06-13 12:03:01 -07:00
kevinz000
6f1dd34c91
Update plushes.dm
2020-06-13 11:57:11 -07:00
kevinz000
3752aecfdb
fix
2020-06-13 11:30:37 -07:00
kevinz000
180b7d31d9
sigh
2020-06-13 09:24:22 -07:00
CitadelStationBot
4a59066e43
Automatic changelog generation for PR #12505 [ci skip]
2020-06-12 21:28:35 -05:00
Lin
d73b2b8635
Merge pull request #12505 from deathride58/morelgbtholidays
...
Adds more LGBTQIA+ related holidays
2020-06-12 21:28:32 -05:00
