Commit Graph

3727 Commits

Author SHA1 Message Date
Lin
9b888c7b01 Merge pull request #15059 from timothyteakettle/language-fixies
fixes losing your additional language upon changing species
2021-09-02 16:37:43 -05:00
timothyteakettle
f827d33497 Update dna.dm 2021-09-01 18:19:37 +01:00
timothyteakettle
a33a7ed249 fix 2021-09-01 17:54:14 +01:00
Cognition
d18e5e7c25 fixes waddling ruining character size 2021-08-27 21:15:37 -07:00
silicons
d427c43b7b Merge pull request #15032 from keronshb/itemhighlight
Ports Inventory Outlines
2021-08-26 21:41:25 -07:00
silicons
13130b3ee6 Merge pull request #15015 from keronshb/gremlinport
Gremlin Port
2021-08-26 21:40:59 -07:00
silicons
841ff4f81c Merge pull request #15011 from Putnam3145/lavaland-random-atmos
Port of randomized planet atmos
2021-08-26 21:39:23 -07:00
Lin
3f8895e41d Merge pull request #15031 from zeroisthebiggay/patch-16
undoes more Trillby™ Spelling™
2021-08-22 13:19:59 -05:00
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
zeroisthebiggay
7b7541b77e Update glassware.dm 2021-08-21 05:51:02 -04:00
zeroisthebiggay
efc5598263 Update code/datums/components/crafting/glassware/lens_crafting.dm
Co-authored-by: MarinaGryphon <jadebishop.2562@gmail.com>
2021-08-20 21:55:54 -04:00
zeroisthebiggay
42964392e3 Update lens_crafting.dm 2021-08-19 23:39:05 -04:00
keronshb
1b43c5b1ae Merge remote-tracking branch 'upstream/master' into gremlinport 2021-08-17 09:03:09 -04:00
keronshb
45aed7a218 Gremlins 2021-08-15 23:48:24 -04:00
silicons
f4658b49b1 Merge pull request #14991 from bunny232/master
Polyvitiligo now actually does something instead of making you a crayon eater.
2021-08-15 00:20:35 -07:00
Putnam3145
ff52c241f4 Procedural planet atmos 2021-08-14 21:13:45 -07:00
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
2021-08-11 02:54:49 -07:00
bunny232
f3363c7b4e Update skin.dm 2021-08-08 09:05:47 -04:00
bunny232
50cf7a85f8 Merge pull request #2 from Citadel-Station-13/master
a
2021-08-08 08:51:58 -04:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
bunny232
891824182b Merge pull request #1 from Citadel-Station-13/master
a
2021-08-04 19:41:56 -04:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
silicons
c5438c73be Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland
[Review/Testmerge] Icemoon Ruins but on Lavaland!
2021-07-29 22:39:42 -07:00
Artur
4b2bffdff0 Actually makes it work by /obj/screen --> /atom/movable/screen 2021-07-29 14:06:18 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
30016f38a8 compiles 2021-07-28 02:13:57 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
bunny232
c7a7346939 monophobia nerf 2021-07-19 07:36:22 -04:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
silicons
24c2ab8b8c Merge pull request #14940 from timothyteakettle/trash-eating
adds a neutral trash eating quirk
2021-07-18 15:07:29 -07:00
silicons
b0c53fcc57 Merge pull request #14947 from Arturlang/crafting_fixes
Crafting menu cleaning up
2021-07-18 15:07:12 -07:00
Lin
4a7e6e5b00 Merge pull request #14945 from timothyteakettle/plant
fixes photosynthesis stopping nutrition going past well fed from non-photosynthesis means
2021-07-17 09:50:20 -07:00
Artur
5abace9e8c wrong letter and unneceseary variable 2021-07-16 15:22:49 +03:00
Artur
b71a6497e8 Crafting menu fixes and such
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
2021-07-16 03:23:02 +03:00
Timothy Teakettle
07fec51d92 fix 2021-07-15 16:44:48 +01:00
timothyteakettle
41759dd163 fix 2021-07-14 18:15:33 +01:00
timothyteakettle
65c40a51f2 trash ELEMENT 2021-07-14 17:17:44 +01:00
timothyteakettle
39c09a60b8 initial commit 2021-07-13 23:45:31 +01:00
Lin
d50eb91632 Merge pull request #14921 from Putnam3145/componentize-acid
Componentizes acid
2021-07-13 11:52:43 -07:00
Lin
114df4e717 Merge pull request #14920 from Putnam3145/fix-activity-runtime-again
Fixes a runtime in activity tracking
2021-07-12 00:03:53 -07:00
silicons
d0b3857cb6 Merge pull request #14842 from WanderingFox95/WanderingFox95-TheWheelchairPRs
[Ready] Wheelchair Sprite Rollback + Motorized Hoverchairs
2021-07-09 16:50:00 -07:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
Putnam3145
e437f6514a Fixes a runtime in activity tracking 2021-07-03 21:09:27 -07:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
silicons
22ad8f2c8c Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash
[Ready] The Daily Whiplash (Newspaper Baton)
2021-06-29 08:50:48 -07:00
silicons
833a7b958f fix 2021-06-28 13:24:12 -07:00
silicons
0069f12c6f errors 2021-06-28 13:17:14 -07:00
silicons
a5a476f457 cyborg shovies 2021-06-28 13:10:40 -07:00