 kevinz000andGitHub
|
4c89b8c33f
|
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
|
2019-11-14 16:00:45 -07:00 |
|
|
kevinz000andGitHub
|
6909857e04
|
Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
|
2019-11-14 15:58:53 -07:00 |
|
|
kevinz000andGitHub
|
2f4562a63b
|
Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
|
2019-11-14 15:55:04 -07:00 |
|
|
kevinz000andGitHub
|
499afa6666
|
Merge pull request #9663 from Trilbyspaceclone/patch-235
Buffs/Fixes embalming
|
2019-11-14 15:54:38 -07:00 |
|
|
kevinz000andGitHub
|
47f01907f0
|
Merge pull request #9666 from Ghommie/Ghommie-cit296
Shameless late game crew nerf
|
2019-11-14 15:54:13 -07:00 |
|
|
kevinz000andGitHub
|
d15a1b0e6b
|
Merge pull request #9680 from Owai-Seek/extendedbounties
Reworked a bit of bounty stuff.
|
2019-11-14 15:53:07 -07:00 |
|
|
kevinz000andGitHub
|
318c03cc28
|
Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
|
2019-11-14 15:52:11 -07:00 |
|
|
kevinz000andGitHub
|
8f08e1017e
|
Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
|
2019-11-14 15:51:20 -07:00 |
|
|
kevinz000andGitHub
|
d8e89b235f
|
Merge pull request #9689 from Ghommie/Ghommie-cit307
How many times I have encountered this sort of issue in the past and how much of a meme it was...
|
2019-11-14 15:50:52 -07:00 |
|
|
kevinz000andGitHub
|
09e5cd95a3
|
Merge pull request #9690 from Ghommie/Ghommie-cit308
Unmodularize configuration, _globalvars and subsystems.
|
2019-11-14 15:50:20 -07:00 |
|
|
kevinz000andGitHub
|
617b0db310
|
Merge pull request #9692 from Ghommie/Ghommie-cit309
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
|
2019-11-14 15:48:34 -07:00 |
|
|
kevinz000andGitHub
|
af0962088c
|
Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
|
2019-11-14 15:47:18 -07:00 |
|
|
kevinz000andGitHub
|
dfa2296758
|
Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-11-14 15:44:59 -07:00 |
|
|
kevinz000andGitHub
|
d1ea2d9990
|
Merge pull request #9554 from NopemanMcHalt/assu
[READY] Desperate Assistance Battleforce
|
2019-11-14 15:43:51 -07:00 |
|
|
Ghommie
|
98bc6d6c60
|
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
|
2019-11-14 23:33:37 +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
|
3a6dce54ac
|
i'm like 90% sure this is what it's supposed to be.
|
2019-11-14 05:53:58 -08:00 |
|
|
Ghommie
|
322c90fab2
|
Mistake I have done when copypasting.
|
2019-11-14 13:32:57 +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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
e70a76085c
|
Merge pull request #9789 from PersianXerxes/fixReagentDescriptions
Corrects the descriptions of meth and ephedrine
|
2019-11-14 01:38:01 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
Putnam
|
c08c6f5bb7
|
Made roundstart
|
2019-11-13 19:13:16 -08:00 |
|
|
Putnam
|
e88a6f2571
|
why is this HERE
|
2019-11-13 19:12:06 -08: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 |
|
|
Ghommie
|
2c1740f56e
|
#43012 and missing typepaths aaaa
|
2019-11-13 23:26:03 +01:00 |
|
|
kappa-samaandGitHub
|
6ad9c7fef0
|
no shotgun i guess
shit guess i gotta add this to traumas too
|
2019-11-13 17:01:30 -05:00 |
|
|
kappa-samaandGitHub
|
17d8998fef
|
emergent gameplay
|
2019-11-13 16:58:51 -05:00 |
|
|
Ghommie
|
aa441fba5d
|
Ports Improved beach away mission.
|
2019-11-13 22:52:39 +01:00 |
|
|
Ghommie
|
3ce4ef8e27
|
f
|
2019-11-13 21:17:40 +01:00 |
|
|
Ghommie
|
cef72b93eb
|
The files.
|
2019-11-13 20:35:21 +01:00 |
|
|
Ghommie
|
248586cfd7
|
Unmodularize bikehorns and holy weapons.
|
2019-11-13 20:28:19 +01: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 |
|
|
Putnam
|
8a02c1a0a1
|
Made results of vote semi-public
|
2019-11-13 04:30:45 -08:00 |
|
|
Putnam
|
0c3a7d4015
|
holy shit
|
2019-11-13 03:49:22 -08: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 |
|
|
Putnam
|
bbcf91f88c
|
blacklisted blob from clock cult, latejoin revs now higher req threat
|
2019-11-12 23:02:59 -08:00 |
|