 DeltaFire
|
9e9528dced
|
Cult vs Cult changes, Ratvar side
Changes the hardstuns by kindle and spearthrow into debuffs if attacking hostile (Nar'Sian) cultists
|
2019-11-14 21:01:08 +01:00 |
|
|
Putnam
|
6d8f2b8914
|
Made s?laughter demon and apprentice cost threat, too.
|
2019-11-14 06:42:13 -08:00 |
|
|
Ghommie
|
baedb7e091
|
I'm unprofessional.
|
2019-11-14 15:16:06 +01:00 |
|
|
Ghommie
|
7603db2e8b
|
Bad habit of pushing things before the compile.
|
2019-11-14 15:10:32 +01:00 |
|
|
Putnam
|
28a14fd01e
|
Removed janky nuke disk threat increase
|
2019-11-14 05:57:56 -08:00 |
|
|
Ghommie
|
358db4f390
|
Dreamchecker compatibility changes, part 2.
|
2019-11-14 14:54:12 +01:00 |
|
|
Putnam
|
304ce37d6c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-14 02:23:48 -08:00 |
|
|
kevinz000
|
487f98bf68
|
Merge pull request #9775 from Ghommie/Ghommie-cit340
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
|
2019-11-14 01:40:16 -07:00 |
|
|
kevinz000
|
f1612f6619
|
Merge pull request #9791 from kappa-sama/revolverports
ports TG's nicer revolver sprites for russian revolvers, normal .357 revolvers, and golden .357
|
2019-11-14 01:39:21 -07:00 |
|
|
kevinz000
|
e70a76085c
|
Merge pull request #9789 from PersianXerxes/fixReagentDescriptions
Corrects the descriptions of meth and ephedrine
|
2019-11-14 01:38:01 -07:00 |
|
|
kevinz000
|
3015ec5c04
|
Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
|
2019-11-14 01:37:41 -07:00 |
|
|
BlackMajor
|
0c33757b14
|
Fixes a few bugs
|
2019-11-14 18:54:57 +13:00 |
|
|
BlackMajor
|
ce94da9ed3
|
Merge branch 'master' into Yote
|
2019-11-14 17:37:57 +13:00 |
|
|
BlackMajor
|
b9a7685830
|
Adds dogborg catch for doggos and some
|
2019-11-14 17:14:14 +13:00 |
|
|
Putnam
|
ad84b2977a
|
this might help with the disk weirdness
|
2019-11-13 19:14:42 -08:00 |
|
|
Ghommie
|
a7b6443217
|
typo.
|
2019-11-14 03:20:43 +01:00 |
|
|
Ghommie
|
b48ddb99fc
|
Uplink items are now automatically sorted alphabetically. Fixed categories.
|
2019-11-14 02:56:26 +01:00 |
|
|
Putnam
|
5e51cc63f9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-13 16:58:44 -08:00 |
|
|
Ghommie
|
2f1a76c21e
|
Unmodularize keybindings.
|
2019-11-13 23:57:49 +01:00 |
|
|
kappa-sama
|
6ad9c7fef0
|
no shotgun i guess
shit guess i gotta add this to traumas too
|
2019-11-13 17:01:30 -05:00 |
|
|
Ghommie
|
29deebbd23
|
Fixing anti-meta event announcements.
|
2019-11-13 19:01:11 +01:00 |
|
|
TrilbySpaceClone
|
73661cfe52
|
more fixing+ chem selling tweaks
|
2019-11-13 09:39:42 -05:00 |
|
|
TrilbySpaceClone
|
de1ce4afc8
|
more crates and explote fixing
|
2019-11-13 09:15:44 -05:00 |
|
|
TrilbySpaceClone
|
ec57e28c17
|
Merge branch 'master' into Cargo_MKII
|
2019-11-13 08:00:24 -05:00 |
|
|
Anonymous
|
837052740a
|
Merge branch 'master' into assu
# Conflicts Resolved:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
|
2019-11-13 11:59:53 +03:00 |
|
|
kevinz000
|
4e3147b228
|
Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
|
2019-11-12 23:59:31 -07:00 |
|
|
kevinz000
|
18993c735a
|
Merge pull request #9771 from Ghommie/Ghommie-cit338
Porting Robustin's Syndicate Infiltrator PR from tee-gee
|
2019-11-12 23:58:46 -07:00 |
|
|
kappa-sama
|
1aa1d91b61
|
Update uplink_items.dm
|
2019-11-12 17:15:45 -05:00 |
|
|
kappa-sama
|
f093024967
|
better guns
|
2019-11-12 17:04:36 -05:00 |
|
|
Ghommie
|
4ef1d64356
|
PR #47500, #47501, #47557, #47588.
|
2019-11-12 19:00:45 +01:00 |
|
|
Ghommie
|
c5a7c28a1b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
|
2019-11-12 16:04:05 +01:00 |
|
|
Ghommie
|
2b8b8882fb
|
You are actually rifght, that's bad.
|
2019-11-12 15:49:20 +01:00 |
|
|
Persi
|
b8137cde65
|
Reducing meteor warning time
|
2019-11-12 06:02:24 -05:00 |
|
|
Persi
|
c784cab060
|
Corrects the descriptions of meth and ephedrine to reflect that their movespeed buffs were previously removed.
|
2019-11-12 05:37:30 -05:00 |
|
|
Ghommie
|
9fb70c8af9
|
Ghommie rants, comment syntax is at stake.
|
2019-11-12 06:40:30 +01:00 |
|
|
Ghommie
|
176a757f62
|
Fixing suit overlays compatibility with items again.
|
2019-11-12 06:33:06 +01:00 |
|
|
Ghommie
|
fd33879b33
|
Fixing some reagent taste descriptions.
|
2019-11-12 06:20:33 +01:00 |
|
|
Ghommie
|
e3cdb55a8f
|
Makes it compile.
|
2019-11-12 04:45:47 +01:00 |
|
|
Ghommie
|
aad2b5bcd5
|
Fixing Aux base camera/drone RCD actions.
|
2019-11-12 04:35:10 +01:00 |
|
|
Ghommie
|
a18bcd05d7
|
makes it compile.
|
2019-11-12 02:38:45 +01:00 |
|
|
Hatterhat
|
8d2f833735
|
stamina hands
|
2019-11-11 19:14:12 -06:00 |
|
|
Hatterhat
|
d27150331a
|
fast hands
|
2019-11-11 18:59:31 -06:00 |
|
|
Ghommie
|
388a7579b9
|
A few minor clock cult improvements.
|
2019-11-12 01:49:36 +01:00 |
|
|
Ghommie
|
29114de3f1
|
The actual waterflower, am I funny yet?
|
2019-11-12 00:47:36 +01:00 |
|
|
Ghommie
|
19a511929d
|
and "Replaces the slime extract in the clown biodome with a superlube sprayer."
|
2019-11-11 23:39:03 +01:00 |
|
|
Ghommie
|
42d9e3cf51
|
Porting Robustin's Syndicate Infiltrator PR
|
2019-11-11 18:49:18 +01:00 |
|
|
Ghommie
|
63da5ffb13
|
ID console fixes and other tweaks.
|
2019-11-11 17:10:14 +01:00 |
|
|
TrilbySpaceClone
|
6e328ea1b1
|
art of the deal
|
2019-11-11 07:26:12 -05:00 |
|
|
Weblure
|
3dac695d53
|
Merge branch 'master' into Xenobio-Hotkeys
|
2019-11-10 21:55:22 -07:00 |
|
|
BlackMajor
|
4cd741310b
|
Borg changes and module compression
|
2019-11-11 16:35:20 +13:00 |
|