Commit Graph

21280 Commits

Author SHA1 Message Date
Ghom
cc3955ecc7 Fixes pitch black characters 2020-02-04 06:04:43 +01:00
Ghom
bb3505c184 Merge pull request #10852 from MrJWhit/Comments-out-meteor-defense-tech-node
Comments out meteor defense tech node
2020-02-04 05:26:25 +01:00
Ghom
33ef9b4619 Update all_nodes.dm 2020-02-04 05:15:52 +01:00
Ghom
6a88e37ff2 Merge pull request #10801 from Seris02/risingbasschanges
changes to rising bass
2020-02-04 05:14:07 +01:00
Ghommie
26d8d9387a ok 2020-02-04 05:06:59 +01:00
Ghommie
0eb5aa0a2a Removing a couple troublesome NSFW unused prefs. 2020-02-04 04:58:09 +01:00
Ghom
6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
ancientpower
5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
Ghom
b898be92f3 Update say_vr.dm 2020-02-04 02:36:46 +01:00
kevinz000
54d70cd9fe Update gun.dm 2020-02-03 18:33:24 -07:00
Ghommie
89466de29e Good catch linter. 2020-02-04 02:30:14 +01:00
Ghommie
0f708cb856 pAI shenanigeans 2020-02-04 02:26:42 +01:00
Ghommie
7723450d11 welp. 2020-02-04 02:21:23 +01:00
Ghommie
d13d8dd953 Less hacky. 2020-02-04 02:13:11 +01:00
Ghommie
63c8612ccd Refactoring mob holders into an element. 2020-02-04 01:42:59 +01:00
kevinz000
09bb223af0 eh fine 2020-02-03 15:49:41 -07:00
kevinz000
9b4e40e3a7 on second thought, fitting on OCLOTHING slot is a bad idea 2020-02-03 13:48:03 -07:00
kevinz000
c69446d2d1 woops miscalculated 2020-02-03 13:46:54 -07:00
kevinz000
dd113f5c71 L 2020-02-03 13:39:36 -07:00
kevinz000
e1ed34dcde s 2020-02-03 13:38:18 -07:00
kevinz000
8556bcf2b3 compile 2020-02-03 13:36:10 -07:00
kevinz000
70beec5985 woops 2020-02-03 13:30:41 -07:00
kevinz000
24b2bb06bf Update mecha_equipment.dm 2020-02-03 13:17:50 -07:00
kevinz000
e9ec314cf6 yo this is a horrible idea 2020-02-03 13:15:12 -07:00
kevinz000
3e30c9409b riot staves 2020-02-03 13:11:26 -07:00
kevinz000
8910efadfa Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-02-03 13:07:49 -07:00
Ghom
5df6566f01 Update clown_weapons.dm 2020-02-03 20:44:58 +01:00
Ghom
40f7a72e3c Update slippery.dm 2020-02-03 20:32:50 +01:00
Ghom
3cb1a0e9c8 Update slippery.dm 2020-02-03 20:31:57 +01:00
ancientpower
be0695e146 bunny ear style 2020-02-03 12:05:00 -06:00
Ghom
73d865d0f3 Fixes the petting element. 2020-02-03 18:42:22 +01:00
Putnam
aabd0b9e79 fixing quirk removal (whoops) 2020-02-03 08:18:49 -08:00
Putnam
e4e5b651e6 making permassassin scale with dynamic 2020-02-03 08:11:03 -08:00
Putnam
88ce25a09b hopefully fixing the once-assassin 2020-02-03 08:10:45 -08:00
Putnam
72c1f60af7 and now the voting works 2020-02-03 08:10:34 -08:00
Putnam
52432ed0a7 too many dynamic changes for my sanity 2020-02-03 07:12:27 -08:00
Putnam
bc52b99758 ok putnam 2020-02-03 03:27:06 -08:00
Putnam
53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
Putnam
82fbef9920 Made it real time, added to config 2020-02-03 03:13:19 -08:00
Artur
5bf1ebaa53 Initial Commit 2020-02-03 12:01:17 +01:00
kevinz000
d8038edfc8 Update pool_controller.dm 2020-02-03 01:51:23 -07:00
kevinz000
f3b3053a8c Update pool_structures.dm 2020-02-03 01:49:54 -07:00
kevinz000
9a1974e3b6 Update mecha.dm 2020-02-03 00:50:57 -07:00
Ghom
76e34c7e0f Update update_icons.dm 2020-02-03 08:48:12 +01:00
kevinz000
0a6e304ac2 s 2020-02-03 00:47:51 -07:00
Ghom
ccd557122c Update holosign.dm 2020-02-03 08:35:47 +01:00
Ghom
f2fd48bfd9 Update holosign.dm 2020-02-03 08:31:12 +01:00
Ghom
d5166322dc I can't believe I have done this. 2020-02-03 08:23:20 +01:00
Ghommie
84d9430ee4 PC too slow for compile. 2020-02-03 07:21:39 +01:00