Commit Graph

19666 Commits

Author SHA1 Message Date
Putnam
233aeaa456 removed some suggested bad possible contraband 2020-01-26 19:03:09 -08:00
r4d6
ad55c7235d I knew I forgot something 2020-01-26 21:21:26 -05:00
r4d6
09448b86e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Moar-Engines 2020-01-26 20:58:37 -05:00
r4d6
4884165d4f Add TEG, Code & config 2020-01-26 20:58:16 -05:00
necromanceranne
52b1f63941 Literally just kills spinfusors 2020-01-27 12:32:40 +11:00
necromanceranne
5e7b7143de Additional adjustments, added more damage to the mini ebow becaues I forgot to do that originally and made large ebows bulky and heavy weapons 2020-01-27 11:48:56 +11:00
ShadeAware
92398ae354 Why am I having such trouble with a fucking SPAN CLASS 2020-01-26 19:46:30 -05:00
ShadeAware
f7373ae40d WHY DID THE INDENTATION NOT SHOW IT WAS FUCKED UP BEFORE
WEBEDIT CHANGE WEBEDIT CHANGE REEEEEEEEEEEEEE
2020-01-26 19:42:21 -05:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Seris02
0d1e458e9c yuh 2020-01-27 08:32:45 +08:00
ShadeAware
fffea32a59 Lets the user know they improved their switchblade.
Confusion is bad. Lets make it not confusing.
2020-01-26 19:26:58 -05:00
Ghommie
b6998a0b56 Fixes det revolver being riiiisky. 2020-01-27 00:44:25 +01:00
necromanceranne
8e489a7726 Hopefully I put in the override correctly 2020-01-27 10:41:27 +11:00
Ghom
27cd7745ed Merge pull request #10714 from Citadel-Station-13/kevinz000-patch-9
is_ctf_target now checks for innate faction var rather than clothing
2020-01-27 00:14:32 +01:00
ShadeAware
2cd6ed5f26 REEEE STRAY SLASHES
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
2020-01-26 16:31:00 -05:00
ShadeAware
732dd8a3bb Hmm, today I will forget quotes on my strings.
Thank you Putnam.
2020-01-26 16:11:22 -05:00
kevinz000
f59a9d0009 aight bet 2020-01-26 14:05:15 -07:00
kevinz000
b4ee518945 Merge pull request #10725 from Putnam3145/fix-rotation
made engine rotation properly blacklist 0-weighted ones
2020-01-26 14:04:31 -07:00
ShadeAware
e75807430b Adds Makeshift Sprites and Fancy Sprites; Fancy Crafting
Not actually crafting but you get the idea. This won't compile haha.
2020-01-26 15:53:37 -05:00
r4d6
2c8d12aa37 Make people actually able to speak dwarf 2020-01-26 15:50:13 -05:00
kevinz000
41f9669a83 Update other_reagents.dm 2020-01-26 13:29:55 -07:00
kevinz000
9292ff1972 Update damage_procs.dm 2020-01-26 13:27:54 -07:00
r4d6
31dd1bc69f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarven_Language 2020-01-26 14:23:16 -05:00
r4d6
ac84ad803a Add dwarf language 2020-01-26 14:22:21 -05:00
Ghommie
41ee00b7df Refactoring APTFT altclick/verb options into flags 2020-01-26 18:53:16 +01:00
Ghom
17ea82afd6 Update vr_sleeper.dm 2020-01-26 17:25:24 +01:00
Ghom
51aaa5d406 Update areas.dm 2020-01-26 17:24:25 +01:00
kevinz000
97c65aac89 Update kinetic_accelerator.dm 2020-01-26 03:06:31 -07:00
Hatterhat
ff2785f24b boy i hope this fucking compiles 2020-01-26 02:47:41 -06:00
necromanceranne
5ce066a21e Altering the effects of the ebow to hopefully make it not terrible 2020-01-26 17:18:09 +11:00
kevinz000
2e6cfef224 Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-01-25 22:13:28 -07:00
kevinz000
f842a249a4 Update meteor_wave.dm 2020-01-25 22:11:49 -07:00
kevinz000
d7ba4134e1 Update meteor_wave.dm 2020-01-25 22:10:39 -07:00
kevinz000
8b4a050ad3 ok 2020-01-25 22:03:53 -07:00
Ghom
98c8b6c5c8 Merge pull request #10648 from Citadel-Station-13/kevinz000-patch-19
Sprinting in general is now a config
2020-01-26 05:53:53 +01:00
Ghom
9aca79a640 Merge pull request #10466 from Citadel-Station-13/kevinz000-patch-10
Makes monkey gorrilize on radiation easier to achieve
2020-01-26 05:50:15 +01:00
Ghom
a7d698df8e Merge pull request #10707 from Citadel-Station-13/kevinz000-patch-5
Raises damage precision to two decimal places
2020-01-26 05:47:53 +01:00
Ghom
5fd81c5233 Merge pull request #10717 from Putnam3145/meow-mix-fix
Makes "Meow Mix" bar sign actually appear
2020-01-26 05:45:55 +01:00
Putnam
52e473ba07 argh 2020-01-25 19:42:36 -08:00
kevinz000
603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
Putnam
6df56a2cf8 properly fixed flags, also made it close on one side's pressure 2020-01-25 18:31:53 -08:00
Putnam
aba40056b3 relief valve tweaks 2020-01-25 17:10:40 -08:00
Putnam3145
a08cd7c046 Merge pull request #10718 from r4d6/HE-Fix
Fix HE Manifold's sprites
2020-01-25 14:31:11 -08:00
r4d6
d5c09f11bc Fix 2020-01-25 17:23:00 -05:00
Putnam
b36d2dc277 Makes "Meow Mix" bar sign actually appear 2020-01-25 13:56:25 -08:00
Putnam
37777c4cc7 Removed the wirecutting one 2020-01-25 13:37:40 -08:00
Artur
6619ac41c8 *PANIC* 2020-01-25 22:07:57 +02:00
kevinz000
c74a6eaf4c Update capture_the_flag.dm 2020-01-25 09:20:41 -07:00
kevinz000
40b479eb17 Update seeds.dm 2020-01-25 08:56:06 -07:00
kevinz000
c0b7541e62 Merge pull request #10691 from Seris02/mentorfix
very very tentative fix for the make mentor button
2020-01-25 08:08:32 -07:00