Ghommie
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Ghommie
2c578ca683
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2019-10-24 18:01:46 +02:00
Ghommie
3d22f4ec60
Porting a load of disease/symptoms code updates.
2019-10-05 07:14:25 +02:00
Ghommie
b2d82bd1f1
Applying upstream fixes.
2019-06-17 00:27:07 +02:00
Poojawa
284e9d0325
module things, jfc
2018-09-11 07:51:01 -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
862898526d
Gamemode and gamemode vote obfuscation (Plus hub entry rework) ( #6276 )
...
* adds gamemode/gamemode vote obfuscation, redesigns hub entry
* ternaries: the easiest way to obfuscate your code to the point where even you can't read it
* FUCK
* changes the inaccuracy chance from 1/10 to 1/5
2018-04-27 07:40:45 -07:00
deathride58
fd9bc8c35e
mob folder - camera to dead
2018-01-04 00:59:07 -05:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
deathride58
dc7dd2da3c
Update dead.dm
2017-12-13 12:05:09 -05:00
Jordan Brown
1bb487ebae
Fixes lobby stat entries not showing
2017-12-12 15:56:38 -06:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
3d0a1b2573
commit
2017-05-14 00:05:53 -05:00
CitadelStationBot
c782e15d64
[MIRROR] Fix server hop ( #740 )
...
* Fix server hop
* Delete new_player.dm.rej
2017-05-08 16:47:21 -07:00
LetterJay
2d9a497f31
Merge pull request #609 from Citadel-Station-13/upstream-merge-26625
...
[MIRROR] Server hop can now be used in lobby
2017-05-01 07:39:35 -05:00
CitadelStationBot
82ecda1353
Server hop can now be used in lobby
2017-04-27 16:40:53 -05:00
CitadelStationBot
cea81a3357
Initialize Refactor
2017-04-26 16:03:17 -05:00
CitadelStationBot
1a93abc66e
Conveyor movement refactor/fix
2017-04-21 17:28:09 -05: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