Seris02
|
468c59bf49
|
oops
|
2020-04-13 20:12:20 +08:00 |
|
Seris02
|
950038f4a7
|
merge fixes?
|
2020-04-13 11:12:16 +08:00 |
|
Seris02
|
f158536e59
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers
|
2020-04-13 11:10:24 +08:00 |
|
Seris02
|
105f83e7ec
|
merge fixes
|
2020-04-13 11:08:26 +08:00 |
|
Seris02
|
b9c9991a5d
|
merge fix
|
2020-04-13 10:57:09 +08:00 |
|
kevinz000
|
5bc138662c
|
Merge pull request #11836 from Citadel-Station-13/Ghommie-patch-7
Made a few for loops typed again.
|
2020-04-12 18:36:26 -07:00 |
|
Ghom
|
609eb190e0
|
Update area_copy.dm
|
2020-04-13 03:29:07 +02:00 |
|
kevinz000
|
e962afedfa
|
Merge pull request #11825 from Ghommie/Ghommie-cit674
Little Holodeck refactor.
|
2020-04-12 17:03:11 -07:00 |
|
CitadelStationBot
|
deacf27454
|
Automatic changelog generation for PR #11824 [ci skip]
|
2020-04-12 19:02:54 -05:00 |
|
kevinz000
|
80de717dc8
|
Merge pull request #11824 from Ghommie/Ghommie-cit673
Fixes occasional tunnel hole in the space hermit ruin.
|
2020-04-12 17:02:52 -07:00 |
|
CitadelStationBot
|
2d96c7eb6e
|
Automatic changelog generation for PR #11819 [ci skip]
|
2020-04-12 19:02:39 -05:00 |
|
kevinz000
|
6b6683846b
|
Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
|
2020-04-12 17:02:36 -07:00 |
|
CitadelStationBot
|
3aad79f6e1
|
Automatic changelog generation for PR #11811 [ci skip]
|
2020-04-12 19:01:53 -05:00 |
|
kevinz000
|
8604297dcd
|
Merge pull request #11811 from Ghommie/Ghommie-cit671
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-12 17:01:50 -07:00 |
|
kevinz000
|
f647fe92fa
|
Merge pull request #11810 from Citadel-Station-13/Ghommie-patch-4
Re-enables hulks.
|
2020-04-12 17:01:22 -07:00 |
|
CitadelStationBot
|
affe2463b6
|
Automatic changelog generation for PR #11817 [ci skip]
|
2020-04-12 18:48:16 -05: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 |
|
CitadelStationBot
|
2df365064a
|
Automatic changelog generation for PR #11697 [ci skip]
|
2020-04-12 18:16:41 -05: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 |
|
CitadelStationBot
|
6cd1d195ad
|
Automatic changelog generation for PR #10732 [ci skip]
|
2020-04-12 13:47:22 -05: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 |
|
CitadelStationBot
|
05dad4c3d1
|
Automatic changelog generation for PR #11823 [ci skip]
|
2020-04-11 23:29:43 -05:00 |
|
Ghom
|
fc58a34248
|
Merge pull request #11823 from Putnam3145/contam-buff
Bringing contamination back
|
2020-04-12 06:29:40 +02:00 |
|
Ghom
|
f0c9a15fdb
|
Merge pull request #11762 from Kraseo/whoopsie
hey guess who forgot about kilo's public mining shuttle dock
|
2020-04-12 06:29:05 +02:00 |
|
CitadelStationBot
|
cfd1d822e3
|
Automatic changelog generation for PR #11812 [ci skip]
|
2020-04-11 23:25:54 -05: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 |
|
CitadelStationBot
|
d024b991dd
|
Automatic changelog generation for PR #11814 [ci skip]
|
2020-04-11 23:25:00 -05: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 |
|
CitadelStationBot
|
b9d523fac9
|
Automatic changelog generation for PR #11816 [ci skip]
|
2020-04-11 23:23:50 -05: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 |
|
CitadelStationBot
|
3742de8b02
|
Automatic changelog generation for PR #10891 [ci skip]
|
2020-04-11 22:48:24 -05:00 |
|
Ghom
|
a96f6238df
|
Merge pull request #10891 from Trilbyspaceclone/more_crates+bags
[Ready]Better crate options
|
2020-04-12 05:48:20 +02:00 |
|
CitadelStationBot
|
1ee02d8742
|
Automatic changelog generation for PR #11807 [ci skip]
|
2020-04-11 22:46:10 -05: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
|
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 |
|
Ghommie
|
31e0321808
|
Minor action datum refactor and spellcasting fix.
|
2020-04-11 16:53:08 +02: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 |
|