timothyteakettle
002fa1da1d
how did i fuck that up
2020-06-16 00:34:28 +01:00
timothyteakettle
35aa1c4520
merge conflict fixes
2020-06-15 23:56:46 +01:00
timothyteakettle
61c338ca8c
Merge branch 'embed-changes' of https://github.com/timothyteakettle/Citadel-Station-13 into embed-changes
2020-06-15 23:50:35 +01:00
timothyteakettle
e010212180
please work
2020-06-15 23:49:38 +01:00
Timothy Teakettle
eba1e8f301
fixes the merge conflicts
2020-06-15 23:29:49 +01:00
Timothy Teakettle
7fbfb4ad0e
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01: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
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
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
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
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
Timothy Teakettle
5df4931266
fix food cart ( #12523 )
2020-06-14 22:50:16 -07: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
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
Lin
923cb248d2
Merge pull request #12515 from kevinz000/roomba
...
Zoombas
2020-06-14 14:36:03 -05: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
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
Lin
d73b2b8635
Merge pull request #12505 from deathride58/morelgbtholidays
...
Adds more LGBTQIA+ related holidays
2020-06-12 21:28:32 -05:00
Ghom
834432d59f
Merge pull request #12510 from TheObserver-sys/Finally!AUseForPeas!
...
Finally, A use for peas!
2020-06-13 04:27:04 +02:00
Ghom
67c9ff4026
Merge pull request #12514 from Citadel-Station-13/kevinz000-patch-18-1
...
the abstract idea of shadows can no longer be radioactive
2020-06-13 04:25:50 +02:00
kevinz000
3dbfc6ddf2
better support
2020-06-12 18:50:57 -07:00
kevinz000
9a08623308
sigh
2020-06-12 18:39:45 -07:00
kevinz000
e2aab5c1a5
css is really hard folks
2020-06-12 18:01:53 -07:00
kevinz000
e1a1dc61f6
this is ugly and i hate it
2020-06-12 17:50:23 -07:00
kevinz000
78e153cbe4
is this better
2020-06-12 17:32:17 -07:00
kevinz000
8e6dee515a
null isn't an object
2020-06-12 17:16:36 -07:00
kevinz000
be6ea51f19
closing
2020-06-12 17:11:29 -07:00
Ghom
77c428479e
changes the inefficient attack message string and threshold. ( #12498 )
2020-06-12 17:08:10 -07:00
Ghom
37294fd4b7
Fixing wrong helmet type for old beserker hardsuit ( #12503 )
2020-06-12 17:07:59 -07:00
YakumoChen
2473308b4d
Adds polychrome uniforms to loadout / kinkmate ( #12506 )
...
* adds revealing poly outfits to kinkmate
* Using unused poly uniforms
* adds polychrome to kinkmate
2020-06-12 17:07:48 -07:00
Ghom
7dc7961b70
Clearing gc issues for a couple objects. ( #12508 )
...
* Clearing gc issues for a couple objects.
* Linter check.
2020-06-12 17:07:36 -07:00
kevinz000
c42894ddd9
css?
2020-06-12 17:07:10 -07:00
kevinz000
52ab6e557b
fix
2020-06-12 17:00:01 -07:00
kevinz000
3cf14f4fad
prettier
2020-06-12 16:48:22 -07:00
kevinz000
6cf18e1d49
why did i find replace
2020-06-12 16:38:28 -07:00
kevinz000
c7eead3f28
don't blind find/replace folks
2020-06-12 16:34:54 -07:00
