43 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 e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Hatterhat c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
Hatterhat 95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
Letter N a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Artur 6c4e733a38 More testmerge fixes 2020-07-03 15:16:02 +03:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Artur 8b21a60ac9 MF Line endings 2020-01-20 14:09:22 +02:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Seris02 6dc3fca905 makes gps show location on examine 2019-11-08 19:24:54 +08:00
Ghommie fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie 5e4bbb0d02 Awaken, code. 2019-05-21 22:45:59 +02:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
ShizCalev 452b34caa2 Cleans up leftover telesci teleporter code (#38789) 2018-07-01 05:43:43 -05:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07: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
ShizCalev f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06: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
ShizCalev 80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -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
Leo 29e20a55de Merge pull request #31842 from GunHog/GPS_Name_Fix
GPS renaming fix
2017-10-18 07:23:31 -05:00
kingofkosmos f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
vuonojenmustaturska 053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
kevinz000 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876)
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
2017-05-18 06:51:26 -05:00
CitadelStationBot 257cf986c5 Repaths C4 (#808)
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
CitadelStationBot 5790e8359a [MIRROR] GPS Personalizations [Post TGPSUI] (#642)
* GPS Personalizations [Post TGPSUI]

* Delete gps.dm.rej

* Update gps.dm

* eol
2017-05-10 16:27:49 -07:00
kevinz000 005d8a8156 Lets try that again... (#868)
* TGUI GPS

* fixes .rej
2017-05-08 22:58:46 -07:00
kevinz000 77c066d93a Revert "[MIRROR] TGUI GPS" (#867)
* Revert "Automatic changelog generation for PR #608 [ci skip]"

This reverts commit 7701c39fde.

* Revert "TGUI GPS (#608)"

This reverts commit ba0f4b1c59.
2017-05-08 22:48:34 -07:00
CitadelStationBot ba0f4b1c59 TGUI GPS (#608) 2017-05-08 22:46:42 -07:00
Poojawa 7e9b96a00f April sync (#360)
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
2017-04-13 23:37:00 -05:00