 Artur
|
375c62175f
|
Finishing touches, fixes icons
|
2020-04-15 12:04:25 +03:00 |
|
|
necromanceranne
|
d0d766efb5
|
Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts
|
2020-04-15 19:00:01 +10:00 |
|
|
UristMcAstronaut
|
ec452de0b2
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-15 08:41:17 +00:00 |
|
|
kevinz000
|
20c3c648ce
|
Update living.dm
|
2020-04-14 21:50:39 -07:00 |
|
|
Trilbyspaceclone
|
68272ac91a
|
Update flowers.dm
|
2020-04-14 23:14:10 -04:00 |
|
|
Putnam
|
3b79d6085b
|
WHOOPS GOTTA UPDATE SAVEFILE VERSION
|
2020-04-14 20:10:32 -07:00 |
|
|
TrilbySpaceClone
|
8fed6552cd
|
last fixes
|
2020-04-14 22:44:47 -04:00 |
|
|
TrilbySpaceClone
|
4419dc13f5
|
changes and additons
|
2020-04-14 22:17:53 -04:00 |
|
|
Trilbyspaceclone
|
3def6b861f
|
Update drink_events.dm
|
2020-04-14 20:04:18 -04:00 |
|
|
Trilbyspaceclone
|
8410d6f35f
|
Why are you like this coffee
|
2020-04-14 19:40:52 -04:00 |
|
|
Trilbyspaceclone
|
c4f951b80b
|
Tho it IS ment to be 6 not 10
|
2020-04-14 19:35:23 -04:00 |
|
|
TrilbySpaceClone
|
d49210fd48
|
Merge branch 'master' into race_drinks
|
2020-04-14 19:21:47 -04:00 |
|
|
TrilbySpaceClone
|
a46a6227a9
|
Finally done...
|
2020-04-14 19:11:53 -04:00 |
|
|
Linzolle
|
d43cb78b8b
|
one more
|
2020-04-14 18:02:51 -05:00 |
|
|
Linzolle
|
166370fb6c
|
missed one
|
2020-04-14 17:55:22 -05:00 |
|
|
Linzolle
|
39e6541ccd
|
remove bad words
|
2020-04-14 17:54:07 -05:00 |
|
|
Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
|
Ghommie
|
d84ef22f22
|
I'm amazed this actually works fine.
|
2020-04-14 21:58:37 +02:00 |
|
|
Ghom
|
6c977f347d
|
Update game_options.dm
|
2020-04-14 20:40:59 +02:00 |
|
|
Lin
|
79f41bc654
|
Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4
Hardsuit helmet peeve.
|
2020-04-14 18:37:31 +00:00 |
|
|
Ghommie
|
c774f18758
|
.
|
2020-04-14 19:18:08 +02:00 |
|
|
Putnam
|
4703af111d
|
actually let's just delete this file
|
2020-04-14 10:12:17 -07:00 |
|
|
Ghommie
|
571584901c
|
Custom skin tone preferences.
|
2020-04-14 19:10:28 +02:00 |
|
|
UristMcAstronaut
|
1eafcbeb1e
|
Add files via upload
|
2020-04-14 16:22:16 +00:00 |
|
|
UristMcAstronaut
|
ec734475cc
|
Add files via upload
|
2020-04-14 16:21:30 +00:00 |
|
|
TrilbySpaceClone
|
79a72a50d4
|
this is annoying, why is angel not defind as a race
|
2020-04-14 11:13:49 -04:00 |
|
|
Ghom
|
55402b1834
|
Merge branch 'master' into Ghommie-cit679
|
2020-04-14 16:22:00 +02:00 |
|
|
Trilbyspaceclone
|
34397a5d17
|
Update lootdrop.dm
|
2020-04-14 10:13:23 -04:00 |
|
|
Trilbyspaceclone
|
2ebf23a32d
|
Update utility_closets.dm
|
2020-04-14 10:12:27 -04:00 |
|
|
Trilbyspaceclone
|
e7247c6a60
|
Update wallets.dm
|
2020-04-14 10:11:37 -04:00 |
|
|
Trilbyspaceclone
|
5833ed8029
|
Merge branch 'master' into tools_andstuff
|
2020-04-14 10:10:32 -04:00 |
|
|
Ghom
|
a57828703e
|
Update mobs.dm
|
2020-04-14 16:09:31 +02: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
|
3ec71612e7
|
Update uplink_bundles.dm
|
2020-04-14 01:49:14 -07:00 |
|
|
kevinz000
|
b10c479d16
|
Merge pull request #11655 from Citadel-Station-13/Ghommie-patch-3
Gives a cooldown to the crusher's vortex talisman trophy.
|
2020-04-14 01:37:36 -07: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
|
5baa5ebf55
|
Merge pull request #11828 from Citadel-Station-13/Ghommie-patch-2
Fixes toilet cistern loot spawning on the floor.
|
2020-04-14 01:35:04 -07:00 |
|
|
kevinz000
|
1f900f0e9d
|
Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5
Fixing a whacky miniature cell duping issue.
|
2020-04-14 01:34:45 -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 |
|
|
kevinz000
|
2961bf8698
|
Merge pull request #11838 from kappa-sama/gamingtime
makes circuit theft admin only
|
2020-04-14 01:33:06 -07:00 |
|
|
Artur
|
fb7dc7a54c
|
Fucking icons
|
2020-04-14 09:42:11 +03: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 |
|
|
Artur
|
325c011142
|
Comsigs are hard...
|
2020-04-14 09:07:37 +03:00 |
|
|
Putnam
|
3543da036b
|
actually i don't know what this does
|
2020-04-13 17:37:03 -07:00 |
|
|
Putnam
|
dabe56fea1
|
Experimental major optimization
|
2020-04-13 17:30:49 -07: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
|
e753c1ad14
|
Fixed a little peeve with random bodies.
|
2020-04-14 02:20:19 +02:00 |
|
|
Putnam
|
d0cea0d84a
|
Replaced a .len with a length() just in case
|
2020-04-13 17:19:39 -07:00 |
|