Commit Graph

54 Commits

Author SHA1 Message Date
DeltaFire
66e81e7fda asay ping time 2021-10-11 19:52:30 +02:00
keronshb
8f1db2d5ec Fixes some stuff
Actually ticks the spell, fixes the brain damage issue, etc.
2021-05-27 12:16:54 -04:00
Letter N
47a3afff54 DB stickies 2020-12-23 16:50:48 +08:00
silicons
8e83dcd697 event permissions 2020-10-07 14:43:53 -07:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Timothy Teakettle
b06948bed4 fry smite 2020-07-20 17:48:37 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
silicons
484da28600 Merge branch 'master' into shoelaces 2020-07-16 17:31:41 -07:00
timothyteakettle
03bd806c73 pickle 2020-07-16 02:51:07 +01:00
silicons
3d80792e79 more 2020-07-11 00:37:56 -07:00
kevinz000
b57e1c1e93 Rebindable Hotkeys (#12138)
* demodularize interface

* keybindings

* binds

* prefs

* loose ends

* globals

* changes

* s

* datum ref lists

* ok

* fixes

* fixes

* fix

* ok

* sigh

* sigh

* indicators

* let's play the move code around game

* let's play the i didn't comma my lists game

* let's play the indent game

* let's play hte spelling bee

* let's fail the spelling bee

* LET'S PLAY THe HOW HARd  IS  IT TO SPELL A PROC GAME

* let's play the bugfix game

* bugfixes

* improvements

* Update bindings_client.dm

* pixel shift

* A

* wups
2020-05-20 23:40:20 +02:00
Ghom
5257ab2e00 Merge pull request #10559 from Seris02/custompie
custom reagent pie smite
2020-02-01 01:46:15 +01:00
kevinz000
41bbdae220 micro optimization 2020-01-14 17:50:14 -07:00
Seris02
8ce7ac8854 custom reagent creampie 2020-01-14 22:10:41 +08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
deathride58
4551b13547 [s] ports tgstation/tgstation#46425 2019-09-11 19:24:05 -04:00
BlackMajor
00356ce980 Cream pie smite 2019-05-18 17:09:26 +12:00
kevinz000
42264cb671 Update admin.dm 2019-02-17 01:55:23 -08:00
Poojawa
49467dbd72 Defines 2018-09-11 00:45:50 -05:00
kevinz000
4ff02b5a8b Sliding Puzzle 2018-08-07 04:44:12 -07:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
MrDoomBringer
678e429dbf Adds a Supplypod-delivery admin smite (#38069)
* wa la

* oop forgot an icon

* buildmode compatibility

* ok

* makes centcompod default

* CentCom pods fall faster and are capatilized right

* yike

* yike2

* FASTER

* white space and default icon state

* spacemaniac thanks
2018-06-04 00:37:24 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
Poojawa
f2b0456dc5 defines, helpers, onclick 2018-04-22 23:56:25 -05:00
Poojawa
fcc038c41a defines, helpers, globalvars 2018-03-06 21:05:15 -06:00
CitadelStationBot
30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788)
* Clean up all sorts of crap, mostly defines

* fixes compile errors
2018-03-05 13:23:28 -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
deathride58
af96f58ffd syncs defines 2018-01-03 23:15:49 -05:00
AnturK
6c4d687db6 Immovable rod abuse, smite and event trigger. (#33681) 2017-12-21 00:11:20 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Kyle Spier-Swenson
55247e9bdf Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. 2017-12-13 21:04:00 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
Armhulen
49d5d08456 Adds a fireball from the heavens as an admin smite (#31502)
* really gamers?

* yeah yeah YEAH

* cucked again!

* it works

* I SAID IT WORKS
2017-10-12 20:37:58 -05:00
Jordan Brown
58fd7f2067 Merge pull request #31413 from vuonojenmustaturska/codejanitoring
Removes useless commented-out what-if code from the 1970s
2017-10-08 10:00:34 -05:00
LetterJay
7cdd5eaa02 Update admin.dm 2017-09-11 14:22:23 -05:00
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -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
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
Poojawa
f866139c52 Admin ticket tgstyle (#493)
* some porting

* other changes
2017-04-20 22:00:47 -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
Poojawa
06e49c2df3 define things and soapstone strings 2017-02-07 23:52:33 -06:00