Commit Graph

207 Commits

Author SHA1 Message Date
evilew 10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
zerothebigboy d93dcf5b76 sickkicks 2023-02-01 08:25:30 -05:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
Putnam3145 db06dbcd58 forgot to commit and push 2022-08-02 16:44:05 -07:00
deathride58 20eb61b319 makes slimes specifically have overlay-blended blood! 2022-05-26 22:56:10 -04:00
deathride58 a37c3a8721 multiplicative blood - makes the majority of blood visuals use multiplicative blending 2022-05-25 03:25:20 -04:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
Hatterhat cd0c2aa496 your jordans are fake 2022-01-02 04:33:25 -06:00
keronshb 46e5372f10 No anthro icons 2021-10-15 19:57:11 -04:00
keronshb 95bb14bb67 Adds the missing hats, missing wings, and clothes to vendor. 2021-10-15 16:59:16 -04:00
keronshb 13140f9bb9 Somewhat fixed huds and stuff, not 100% 2021-10-14 16:36:18 -04:00
keronshb bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
keronshb 41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
keronshb 0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
keronshb 70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
keronshb 78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
keronshb 77d302f8f6 Ports Swag Outfit 2021-05-24 12:47:55 -04:00
Adelphon 919e23c122 More Clothes 2021-02-11 02:36:50 -05:00
Chiirno e58f170057 begrudgingly added ctrl+click to the examine info. 2021-02-04 19:37:34 -04:00
Chiirno c85e381169 Waddlers rise upgit add * 2021-02-04 18:25:37 -04:00
Blue Wildrose c79177ab07 Adds Timid wo/man outfits 2021-01-18 13:42:38 -07:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons 06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
silicons bc823b544f sigh 2020-07-29 01:17:16 -07:00
silicons 1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
Timothy Teakettle a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons 6fbe083e13 ok 2020-07-11 07:03:41 -07:00
silicons cc2e9530b1 fix 2020-07-11 00:44:17 -07:00
silicons ed847b1a58 compile 2020-07-11 00:42:13 -07:00
silicons 3d80792e79 more 2020-07-11 00:37:56 -07:00
silicons 8d5d194a26 hahahahaha 2020-07-11 00:30:56 -07:00
Timothy Teakettle 334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
Ghom 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07: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
Ghommie 7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Linzolle 24da94720b cold res 2020-05-08 11:51:24 -05: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
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Seris02 c0ff018bef fixes magboots 2020-04-16 16:23:55 +08:00