Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
Ghom
|
49e36e47ff
|
Merge pull request #11809 from kevinz000/storage_rework
Adds baystation-style volumetric space storage support
|
2020-04-14 13:17:11 +02:00 |
|
Ghom
|
5d01e05991
|
Merge pull request #11618 from Arturlang/Garlic
Adds garlic, and tweaks bloodsuckers a bunch.
|
2020-04-14 12:38:34 +02:00 |
|
kevinz000
|
7861b044ea
|
Merge pull request #11826 from Ghommie/Ghommie-cit675
Body size preferences! Oh no!
|
2020-04-14 01:35:46 -07:00 |
|
kevinz000
|
e271376c4e
|
Merge pull request #11830 from Ghommie/Ghommie-cit676
Fixes the phantom thief component, again
|
2020-04-14 01:34:18 -07:00 |
|
Artur
|
356f2913d7
|
Ghommies suggestions and renames a proc
|
2020-04-14 09:30:14 +03:00 |
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
Putnam3145
|
d1bdcd3401
|
Merge pull request #11840 from Citadel-Station-13/Ghommie-patch-1
Actually fixed wizard garbs.
|
2020-04-13 17:26:55 -07:00 |
|
Ghommie
|
39e645b018
|
I knew using lazy helpers wouldn't have helped much.
|
2020-04-14 01:55:01 +02:00 |
|
Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
Ghommie
|
616d482cf6
|
Deleting poly clothes copypasta.
|
2020-04-13 22:51:46 +02:00 |
|
Ghommie
|
8c995dbad9
|
Making things work.
|
2020-04-13 19:16:55 +02:00 |
|
Ghommie
|
bfa006fac1
|
Fixing runtime errors.
|
2020-04-13 17:25:13 +02:00 |
|
Ghommie
|
db43f53ac4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 16:15:40 +02:00 |
|
Ghommie
|
0816512150
|
more work.
|
2020-04-13 16:09:52 +02:00 |
|
kevinz000
|
9f2ed092c5
|
Merge pull request #11275 from Citadel-Station-13/Ghommie-patch-6
Reenables the swarmers event.
|
2020-04-13 05:50:24 -07:00 |
|
Ghom
|
8145513ba7
|
Actually fixed wizard garbs.
|
2020-04-13 14:19:13 +02: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 |
|
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 |
|
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 |
|
Ghommie
|
acb5c39b59
|
Fixes the phantom thief component for the Xth time.
|
2020-04-12 07:47:28 +02:00 |
|
Ghom
|
fc58a34248
|
Merge pull request #11823 from Putnam3145/contam-buff
Bringing contamination back
|
2020-04-12 06:29:40 +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 |
|
Ghommie
|
fe4b270568
|
Sprite size preferences?! Oh no!
|
2020-04-12 05:08:49 +02:00 |
|
Putnam
|
a779ec2411
|
Makes contamination work (whoops)
|
2020-04-11 12:42:25 -07:00 |
|
Ghommie
|
31e0321808
|
Minor action datum refactor and spellcasting fix.
|
2020-04-11 16:53:08 +02:00 |
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
necromanceranne
|
b6d079f91f
|
fixes rising bass and sleeping carp not dodging
|
2020-04-11 13:00:32 +10:00 |
|
kevinz000
|
b21598a441
|
fix
|
2020-04-10 12:47:16 -07:00 |
|
kevinz000
|
bf1ffb7ebd
|
Merge branch 'storage_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into storage_rework
|
2020-04-10 12:44:28 -07:00 |
|
kevinz000
|
3788496204
|
multiline support
|
2020-04-10 12:42:50 -07:00 |
|
kappa-sama
|
2afda4c216
|
forgot oop
|
2020-04-10 14:24:20 -04:00 |
|
kappa-sama
|
91726f340a
|
Update krav_maga.dm
|
2020-04-10 14:08:16 -04:00 |
|
Arturlang
|
b40fb55539
|
Fixes mesmerzie and makes it work better (#11785)
* Weh
* Mesmerize works a lot nicer now
|
2020-04-10 15:41:35 +02:00 |
|
Ghom
|
a38e6e88a0
|
Enables hulk smash.
|
2020-04-10 14:07:39 +02:00 |
|
kevinz000
|
a02bad15ea
|
Update stack.dm
|
2020-04-10 04:45:28 -07:00 |
|
kevinz000
|
6705fc9724
|
Update rped.dm
|
2020-04-10 04:45:19 -07:00 |
|
kevinz000
|
a9f6ac4131
|
default to legacy
|
2020-04-10 04:42:51 -07:00 |
|
kevinz000
|
84c8183ccb
|
k
|
2020-04-10 04:42:34 -07:00 |
|
kevinz000
|
bc16600070
|
alternative way
|
2020-04-10 04:00:59 -07:00 |
|
kevinz000
|
165379c0b8
|
storage
|
2020-04-10 02:19:19 -07:00 |
|
kevinz000
|
36cd3b4c35
|
i should have just ported from baystation instead of reinventing the fricking wheel
|
2020-04-10 01:23:36 -07:00 |
|
kevinz000
|
e2440034f5
|
matrices..
|
2020-04-10 01:07:53 -07:00 |
|
kevinz000
|
d658a0c1d4
|
k
|
2020-04-10 00:21:40 -07:00 |
|
kevinz000
|
be398004b7
|
groan
|
2020-04-10 00:16:43 -07:00 |
|
kevinz000
|
a9e738b8b1
|
k
|
2020-04-09 23:14:07 -07:00 |
|
kevinz000
|
9b13f009fe
|
k
|
2020-04-09 23:12:37 -07:00 |
|
kevinz000
|
ffe206f3e1
|
k
|
2020-04-09 22:33:54 -07:00 |
|