Trilbyspaceclone
c21011c64c
Update spellcard.dm
2020-07-07 14:09:31 -04:00
Trilbyspaceclone
f7dbce0cd0
Update spellcard.dm
2020-07-07 13:55:02 -04:00
Trilbyspaceclone
dae3110100
Update wand.dm
2020-07-07 13:52:41 -04:00
Trilbyspaceclone
8aceeb0c43
Update spell_book.dm
2020-07-07 13:50:42 -04:00
Trilbyspaceclone
49b0d38112
Apply suggestions from code review
...
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-07-07 13:47:56 -04:00
Trilbyspaceclone
4e1817d2be
why were these tabs?
2020-06-17 03:22:29 -04:00
Trilbyspaceclone
4d9eeae268
Update necropolis_chests.dm
2020-06-17 03:08:52 -04:00
Trilbyspaceclone
51da7dfa71
Merge branch 'master' into spike-loot-differentces
2020-06-17 02:36:52 -04:00
kevinz000
ba162eb90a
Merge pull request #12530 from Detective-Google/no-more-100%-chance-combat-upgrade
...
Ashwalker den no longer spawns with a Malf upgrade and illegal tech
2020-06-16 23:32:48 -07:00
SmArtKar
170a38a3a7
Porting sutures and meshes from /TG/ ( #12532 )
...
* Porting sutures and meshes from /TG/
* Recipes fix
2020-06-16 16:22:56 -07:00
Trilbyspaceclone
8f35795971
Update autobotter_designs.dm ( #12543 )
2020-06-16 08:25:21 -07: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
Detective Google
fa5bae14f1
no 100% chance doomsday :^)
2020-06-13 22:14:23 -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
9229c1dc0d
Update lobotomy.dm
2020-06-13 13:12:54 -07:00
kevinz000
8162303bad
Merge remote-tracking branch 'citadel/master' into pp_fix
2020-06-13 12:03:01 -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
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
be6ea51f19
closing
2020-06-12 17:11:29 -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
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
kevinz000
146542b077
sdql2
2020-06-12 16:33:36 -07:00
kevinz000
00666422af
fix
2020-06-12 15:47:46 -07:00
kevinz000
86a07fffc3
line fix
2020-06-12 15:34:40 -07:00
kevinz000
f9c624ef80
based vorestation
2020-06-12 15:32:32 -07:00
deathride58
513ed1ab47
Fixes a major HTML injection vulnerability with flavortext by making flavortext store itself as encoded html instead of decoded html ( #12513 )
2020-06-12 15:17:32 -07:00
kevinz000
9c53ba5d68
Update emissive_blocker.dm
2020-06-12 15:13:34 -07:00
Lin
bfe8ccdfb5
Merge pull request #11627 from kevinz000/combat_rework
...
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
Lin
ff216c9c94
Merge pull request #12507 from Citadel-Station-13/removesilicons
...
Clicking on atmospherics objects as a ghost will allow you to scan their air much like with an analyzer.
2020-06-12 16:29:40 -05:00
