 kevinz000
|
f647fe92fa
|
Merge pull request #11810 from Citadel-Station-13/Ghommie-patch-4
Re-enables hulks.
|
2020-04-12 17:01:22 -07:00 |
|
|
Ghommie
|
05a954f000
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 02:01:01 +02:00 |
|
|
Ghom
|
d0af60a2d3
|
Merge pull request #11817 from Putnam3145/dynamic-lings-2
More dynamic tweaks + dynamic latejoin changelings
|
2020-04-13 01:48:12 +02:00 |
|
|
kevinz000
|
d60932ca5d
|
Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
|
2020-04-12 16:16:37 -07:00 |
|
|
deathride58
|
53d893a67e
|
adds rudimentary linux iptables support for fail2topic
|
2020-04-12 16:21:51 -04:00 |
|
|
Ghom
|
b00e97b848
|
Merge pull request #10732 from kevinz000/eldritch_affairs
Eldritch Affairs
|
2020-04-12 20:47:19 +02:00 |
|
|
Lin
|
4e1079bc9a
|
Merge pull request #11786 from Citadel-Station-13/Ghommie-patch-1
I did a oopsie and made containment bags also stop radiation internal to a contained object.
|
2020-04-12 16:20:08 +00:00 |
|
|
Ghommie
|
4e3845da5e
|
Clarifies the scope of the slowdown.
|
2020-04-12 09:53:41 +02:00 |
|
|
Ghommie
|
1afa07dad5
|
Improved readability.
|
2020-04-12 09:40:38 +02:00 |
|
|
Ghom
|
13f9c3c235
|
Update phantomthief.dm
|
2020-04-12 08:03:30 +02:00 |
|
|
Ghommie
|
acb5c39b59
|
Fixes the phantom thief component for the Xth time.
|
2020-04-12 07:47:28 +02:00 |
|
|
Ghom
|
863ecf6627
|
Update watercloset.dm
|
2020-04-12 07:17:50 +02:00 |
|
|
Ghom
|
ab2d458947
|
Update lighting.dm
|
2020-04-12 07:12:54 +02:00 |
|
|
Ghom
|
23b45c9cf3
|
Update lootdrop.dm
|
2020-04-12 06:54:40 +02:00 |
|
|
Ghom
|
501b4f0e3e
|
Update watercloset.dm
|
2020-04-12 06:42:08 +02:00 |
|
|
kiwedespars
|
6f8992e712
|
Update haste.dm
|
2020-04-11 21:34:06 -07:00 |
|
|
Ghom
|
fc58a34248
|
Merge pull request #11823 from Putnam3145/contam-buff
Bringing contamination back
|
2020-04-12 06:29:40 +02:00 |
|
|
Ghom
|
f5852424e3
|
Merge pull request #11812 from Auris456852/master
Adds admin printer noise for Centcomm/Syndicate messages
|
2020-04-12 06:25:52 +02:00 |
|
|
Ghom
|
3f573fb611
|
Merge pull request #11814 from kappa-sama/patch-19
fixes stomping and increases Stam damage from krav
|
2020-04-12 06:24:57 +02:00 |
|
|
Ghom
|
28642ce39c
|
Merge pull request #11816 from necromanceranne/broke_dodging
fixes rising bass and sleeping carp not dodging
|
2020-04-12 06:23:47 +02:00 |
|
|
Ghom
|
a96f6238df
|
Merge pull request #10891 from Trilbyspaceclone/more_crates+bags
[Ready]Better crate options
|
2020-04-12 05:48:20 +02:00 |
|
|
Ghom
|
d693d3ef26
|
Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4
datum pipeline null gasmix stack trace now gives a REF()
|
2020-04-12 05:46:07 +02:00 |
|
|
Ghommie
|
e6fbd0cced
|
Whops
|
2020-04-12 05:13:43 +02:00 |
|
|
Ghommie
|
fe4b270568
|
Sprite size preferences?! Oh no!
|
2020-04-12 05:08:49 +02:00 |
|
|
kevinz000
|
0ea1e557db
|
ok
|
2020-04-11 19:31:19 -07:00 |
|
|
Ghommie
|
983f369357
|
Little Holodeck refactor.
|
2020-04-12 01:49:25 +02:00 |
|
|
Ghom
|
1babc75a69
|
Merge pull request #11818 from spookydonut/patch-1
Update spacemandmm to 1.4
|
2020-04-11 23:59:31 +02:00 |
|
|
Ghommie
|
a141c56b00
|
Not-so-airless turfs.
|
2020-04-11 23:43:01 +02:00 |
|
|
Ghommie
|
ab3ed7f9c2
|
Space Hermit Ruin fixes.
|
2020-04-11 23:27:19 +02:00 |
|
|
Putnam
|
c8ebc6411e
|
Actually let's make it... differenter.
|
2020-04-11 12:58:43 -07:00 |
|
|
Putnam
|
b5a150911c
|
Massively buffs contamination numbers
|
2020-04-11 12:43:14 -07:00 |
|
|
Putnam
|
a779ec2411
|
Makes contamination work (whoops)
|
2020-04-11 12:42:25 -07:00 |
|
|
spookydonut
|
a6f6a27c87
|
Update code/modules/vending/_vending.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-04-12 00:53:57 +08:00 |
|
|
Ghom
|
848c1996e4
|
Merge pull request #11806 from Citadel-Station-13/kevinz000-patch-3-1
removes hotspot expose from skateboards
|
2020-04-11 18:31:26 +02:00 |
|
|
Ghom
|
ae1785af70
|
Merge pull request #11802 from Akrilla/alien_attack
Fixes attack_alien damage
|
2020-04-11 18:31:07 +02:00 |
|
|
Ghom
|
11fa208838
|
Merge pull request #11800 from Akrilla/changling-readapt
Fixes up changling readapting
|
2020-04-11 18:30:49 +02:00 |
|
|
Ghommie
|
7615f63753
|
Oopsie
|
2020-04-11 17:43:09 +02:00 |
|
|
kevinz000
|
6f5c1bac08
|
harmful
|
2020-04-11 08:37:53 -07:00 |
|
|
kevinz000
|
de296c8879
|
Merge branch 'shield_bashing' of github.com-kevinz000:kevinz000/Citadel-Station-13 into shield_bashing
|
2020-04-11 08:37:30 -07:00 |
|
|
kevinz000
|
bcf77458dd
|
nicer way to bash people
|
2020-04-11 08:37:02 -07:00 |
|
|
kevinz000
|
ab1d7c29ad
|
Update shields.dm
|
2020-04-11 08:28:02 -07:00 |
|
|
kevinz000
|
eacc783f09
|
k
|
2020-04-11 08:23:25 -07:00 |
|
|
Ghommie
|
31e0321808
|
Minor action datum refactor and spellcasting fix.
|
2020-04-11 16:53:08 +02:00 |
|
|
kevinz000
|
b39eb60c4a
|
shield bashing
|
2020-04-11 07:30:23 -07:00 |
|
|
kevinz000
|
f3537f38e6
|
shield bashing
|
2020-04-11 07:09:50 -07:00 |
|
|
Ghom
|
f9f1bbc05f
|
Merge pull request #11804 from Akrilla/beepsky-tie
Fixes beepsky ziptie weirdness
|
2020-04-11 13:40:24 +02:00 |
|
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
|
kevinz000
|
f652a612e5
|
missing comma
|
2020-04-10 22:18:53 -07:00 |
|
|
Akrilla
|
8abc0cc0a7
|
!on
|
2020-04-11 05:24:24 +01:00 |
|
|
Putnam
|
d65bda97c4
|
Fixing average threat weight calc
|
2020-04-10 20:14:54 -07:00 |
|