Commit Graph

173 Commits

Author SHA1 Message Date
Xantholne
18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
Blue Wildrose
0e5b2c60ee Fixes loadout specific polychromic hoodies 2020-12-31 03:42:29 -07:00
silicons
ec2df686c3 maybe 2020-12-27 05:31:58 -08:00
silicons
3535916fd8 fix 2020-12-26 22:02:56 -08:00
silicons
1c06dd92c2 fix 2020-12-26 21:55:17 -08:00
silicons
fa6537a092 fix 2020-12-26 21:53:38 -08:00
silicons
5bd20acc1d fix 2020-12-26 21:44:37 -08:00
silicons
0cd0770549 fix 2020-12-26 21:32:12 -08:00
Timothy Teakettle
8846e69c42 ANOTHER ONE 2020-12-07 21:34:52 +00:00
timothyteakettle
61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
timothyteakettle
b1379dd49e still not working 2020-10-27 21:11:42 +00:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons
89f246db39 Merge pull request #13373 from BlueWildrose/why_my_hood_no_color
Fixed toggleable polychromic hoods/helmets not polychroming with their suit
2020-09-11 14:14:16 -07:00
Blue Wildrose
680872e08b 100% less band-aidy polyhood solution 2020-09-10 21:02:27 -07:00
Blue Wildrose
f634a31bfb Update polychromic.dm 2020-09-09 15:28:45 -07:00
Ghommie
4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Ghommie
2811f744e3 Fixing some mistakes with the priority overlays removal PR. 2020-08-26 14:00:35 +02:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
silicons
375e764e4c support updates 2020-08-07 06:19:39 -07:00
lolman360
72af083266 Update photosynthesis.dm (#13032) 2020-08-06 18:02:50 +02:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Sneakyrat6
538e7c62cd Fixes seeing real name in OOC Notes 2020-07-15 13:32:56 -05:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
48c13fcc10 Removing now unused old embed behavior 2020-06-20 00:15:52 +02:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01: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
Timothy Teakettle
28e9542813 fixes 2020-06-11 21:58:13 +01:00
Timothy Teakettle
fda0d4d23e part 5 2020-06-11 21:47:48 +01:00
Timothy Teakettle
38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Timothy Teakettle
8ec5672b85 tonne of fixes 2020-06-10 21:14:08 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01:00
kevinz000
5b863e7e9b Update photosynthesis.dm 2020-06-07 03:43:41 -07:00
kevinz000
6f62cb8678 Update photosynthesis.dm 2020-06-07 03:40:34 -07:00
Ghom
ea763df326 Photosynthesis element. (#12394)
* Photosynthesis element.

* element yaketi sax.

* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -07:00
Ghom
25dbed5b0b Made the decal component an element. (#12388)
* Made the decal component an element.

* Is this really worth it?

* Oh.
2020-05-30 14:06:53 -07:00
Lin
1b8e05875f Merge pull request #12357 from Citadel-Station-13/Ghommie-patch-1
quick tactical fix.
2020-05-26 17:13:32 +00:00
Ghom
85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
Ghom
8fd8b6a0bb Update tactical.dm 2020-05-25 11:16:51 +02:00
Ghom
ce1f1bdf5e Turning a few components into elements. (#12325)
* Turning a few components into elements.

* eh
2020-05-24 13:06:27 -07:00
Ghom
6696560656 slendermen fix. (#12303)
* slendermen fix.

* Whops

* Update dwarfism.dm
2020-05-20 18:43:14 -07:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268)
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
2020-05-18 04:46:57 -07:00
kevinz000
f292d4047c Adds OOC notes (#12067)
* ooc notes

* fixes

* repath

* ok

* This SHOULD compile, or else...

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-11 01:35:48 +02:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002)
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
2020-05-07 14:46:16 +02:00
Putnam3145
ac30079026 Make dust-on-leaving-area code less bad (#12110)
* Un-badcodes dusts_on_leaving_area.

* var/ not necessary

* Fixed the code to work

* help me
2020-05-06 17:03:53 +02:00
kevinz000
fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715
Fixing several reported issues.
2020-05-02 15:54:32 -07:00