Commit Graph

80 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
7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Timothy Teakettle
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444)
* corgi tracker

* better heirloom system

* typo
2020-10-10 12:15:39 +02:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -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
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
Trilbyspaceclone
8bd238c87c Reblances flares, flashlights and eye-lights (#11404)
* Update flashlight.dm

* makes the torch be enlightend

* Update flashlight.dm

* Update code/game/objects/items/devices/flashlight.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* >makes atmo pipes small items >makes heavy duty flashlight lightweight > muh realism

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-26 16:49:49 +01:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Ghommie
c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie
57cecd2499 work 2019-12-25 06:54:44 +01:00
Ghommie
53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Putnam
010bee19f4 damn you feasel 2019-12-01 00:22:15 -08:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Ghommie
92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 2019-07-11 09:07:11 +02:00
Ghommie
a2d896351b Sort of porting "Changes the type pathing of some "random" items" 2019-06-23 07:10:11 +02:00
Ghommie
44a9fe9521 Fixes "Penlights Cannot Give Eye Exams" 2019-06-19 13:38:59 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
deathride58
0dc641f962 noisy flashlights - makes flashlights play a small sound when toggled on/off 2019-01-11 03:08:10 -05:00
Poojawa
c836a7e5ea Cleans up map errors
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
CitadelStationBot
9f5682fa35 [MIRROR] New torch sprites, fixed missing inhands (#6099)
* New torch sprites, fixed missing inhands

* missing sprites
2018-03-26 04:27:30 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
Jordan Brown
d38a4a2aa5 Merge pull request #33905 from ShizCalev/jumpsuit-fix
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-29 10:10:30 -06:00
LetterJay
2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
Ashe Higgs
2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
deathride58
b6630b41d1 merges #3877 proper 2017-11-22 17:37:22 -05:00
bgobandit
119129a80c Adds force to items that really should hurt when hit by (#32200) 2017-10-29 18:49:48 -05:00
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00