Commit Graph

49 Commits

Author SHA1 Message Date
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
WanderingFox95 cf350d0c96 Removes the Bowyery Slab 2021-07-20 19:01:33 +02:00
Timothy Teakettle 58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
silicons 6876edbd85 Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
2020-08-06 19:40:09 -07:00
Hatterhat 6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
Sishen 7fa5ccbd0e fixes slapping uplinks with non uplink items giving runtimes 2020-07-29 16:14:01 -06:00
Sishen 27aba092e0 aaaaaaaaaa 2020-07-27 08:20:03 -06:00
timothyteakettle b94267e1e1 more spellchecks 2020-06-27 02:41:50 +01:00
Ghommie 667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Hatterhat 371e54e2e4 funny meme text 2020-04-22 18:06:30 -05:00
Hatterhat c686ed193b a book about mashing Z and LMB 2020-04-22 17:55:11 -05:00
kevinz000 54713dc1e4 Merge pull request #11408 from necromanceranne/sleeping_carp_port
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
2020-03-11 17:26:33 -07:00
Ghommie 27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
necromanceranne b03d83926a Forgot the scroll 2020-03-10 20:27:40 +11:00
kevinz000 56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
Hatterhat 75a5a6cd45 ellipses. dot dot dot. 2020-02-22 15:21:12 -06:00
Hatterhat 2d29b37ce9 slab spawns and grammar shidd 2020-02-22 15:14:09 -06:00
kevinz000 c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -07:00
TrilbySpaceClone a1f1a01a81 grammer and quiver 2020-02-15 00:52:19 -05:00
TrilbySpaceClone bbe1ddc0cf silk, bows, and graytide! 2020-02-14 23:04:02 -05:00
kevinz000 7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Seris02 9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +08:00
BlackMajor c6732bb516 typo lol 2019-12-16 01:28:34 +13:00
BlackMajor 4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
Seris02 8dfbc652cb ADDS THE NEW MARTIAL ART - RISING BASS!! 2019-11-09 21:11:36 +08:00
TrilbySpaceClone 18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
Trilbyspaceclone 7495de7d15 Update granters.dm 2019-10-11 14:04:08 -04:00
Trilbyspaceclone f43bd91072 Merge branch 'master' into A_Tailer's_art 2019-10-05 11:50:12 -04:00
Trilbyspaceclone 3f957ea488 grammer 2019-09-03 10:43:29 -04:00
Trilbyspaceclone 5168f2b233 Update granters.dm 2019-09-03 07:37:37 -04:00
TrilbySpaceClone 44893b6ee7 It just works 2019-08-26 06:32:54 -04:00
TrilbySpaceClone db317b65af Grand! 2019-08-24 19:39:15 -04:00
TrilbySpaceClone 3a85f9473c amazing 2019-08-02 14:37:52 -04:00
TrilbySpaceClone 7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
TrilbySpaceClone 606639ce23 part 1 fixing shit 2019-07-29 05:52:49 -04:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Trilbyspaceclone 022b648979 Update granters.dm 2019-06-07 18:35:52 -04: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 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
LetterJay 0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
ShizCalev 4e4e07e8bb Fixes mindswap book runtime (#37881) 2018-05-19 05:32:45 -05:00
oranges 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
Armhulen 2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00