silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
Letter N
a19e306137
less redtext - updates anomalies
2020-08-03 20:53:36 +08:00
Letter N
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
Letter N
8e177bf01e
another batch - MAJOR: teleportaiton, displaycase (ico port needed),
2020-07-24 19:58:48 +08:00
silicons
4d48abf3a6
fixes
2020-07-21 11:46:17 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Ghommie
ad4d290ea7
WIP
2020-03-08 19:26:01 +01:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
Ghommie
5644617786
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
2020-01-20 20:59:38 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Ghommie
8c5e506a17
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382
2019-12-21 18:22:58 +01:00
Ghommie
19a3aca619
I fear for my powernet
2019-12-10 15:33:15 +01:00
Ghommie
fe171ac40a
Unmodularize several machinery and structures.
2019-11-20 06:13:57 +01:00
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
Poojawa
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
Poojawa
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Dax Dupont
27ff0a4f28
Display cases can now have a list where to randomly spawn items from ( #36058 )
...
* Adds allowing display cases to pick from a random list
Keeps compatibility with older maps and moves trophy/plaque message to all display cases
* A bit more legible
* Refactors statues tool interaction code
* Don't override it already exists
* done
2018-03-09 02:17:36 -06:00
Jordan Brown
f9353da855
Quote the armor lists
2018-02-16 00:26:26 -06:00
deathride58
72ff7be9bd
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
AnturK
89766bdc4e
Makes getFlatIcon slower. (Also more precise) ( #34199 )
...
* getFlatIcon fixes and improvements. DO NOT TOUCH
* Fixes area blendings
* Stuff
* Drops the named arg
2018-01-16 07:33:41 -06:00
deathride58
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
LetterJay
c28932e4d4
Update displaycase.dm
2017-10-13 22:57:31 -05:00
Jordan Brown
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07: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
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
8bcaa54cbe
[MIRROR] Fixes language code ignoring holder restrictions ( #858 )
...
* Fixes language code ignoring holder restrictions
* resolve .rej file.
2017-05-18 04:13:57 -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
65729cdd55
[MIRROR] Fixes being unable to hit trophy cases in melee ( #844 )
...
* Fixes being unable to hit trophy cases in melee
* Update displaycase.dm
* Delete displaycase.dm.rej
* Update displaycase.dm
2017-05-08 00:31:54 -07:00
CitadelStationBot
9acc4da365
[MIRROR] Curator starts with the key to the display cases instead of being the key ( #763 )
...
* Curator starts with the key to the display cases instead of being the key
* Update displaycase.dm
* Delete displaycase.dm.rej
* Delete civilian.dm.rej
* Update civilian.dm
* fuck line endings
* define true/false
2017-05-08 00:25:59 -07:00
CitadelStationBot
e89bdb6422
[MIRROR] Fixes some stuff ( #768 )
...
* Fixes some stuff
* line fucking endings
2017-05-08 00:25:40 -07:00
kevinz000
335b6cde56
Merge branch 'master' into upstream-merge-26813
2017-05-07 22:31:16 -07:00
kevinz000
a87cee8a05
copy-paste-this-from-tg
2017-05-07 22:30:43 -07:00
kevinz000
48d9e2e349
fixes rejects
2017-05-07 22:24:26 -07:00
CitadelStationBot
ea3ee7accc
Adds persistent trophy cases
2017-05-01 17:31:24 -05:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05: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
ktccd
1a5ec9c3a2
Captain's Laser accessible by captain ( #324 )
...
Changes the access required from centcomm special ops to captain access.
Comment says it was on purpose, but seems poorly explained. As it is, a
lot of people don't seem to know display cases even CAN be opened. And
the gun is the captain's, why would it need special ops access to
retrieve?
2017-04-02 13:03:42 -04:00
Poojawa
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
Poojawa
fc2dbcd9fe
Tg port 2 15 ( #230 )
...
* defines/helpers
* globalvars, onclick, controllers
* datums and game
* woooooooooorld. Uh. dm
* modules sans mobs client admin
* modules/admin
* pref shit
* modules/mob
* icon updates
* extra things
* Cherrypicked fixes from open PRs
* metastation.tgm fix
* a better meta fix
* reverts async breakings
2017-02-15 03:35:32 -06:00
