Lin
|
bc2e97a2a4
|
Merge pull request #13006 from Citadel-Station-13/silicons-patch-68
2x's volumetric storage minimum size because i'm going to stop pretending this ugly shit is usable when even i myself use opt-out to old interface
|
2020-08-05 19:42:28 -05:00 |
|
silicons
|
8442d69858
|
Merge pull request #12963 from Seris02/morefix
ghost chilis fixed
|
2020-08-05 15:44:48 -07:00 |
|
Seris02
|
9b02b6619d
|
Update code/modules/hydroponics/grown/chili.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
|
2020-08-06 06:44:17 +08:00 |
|
silicons
|
57be216251
|
Merge pull request #12995 from timothyteakettle/travelling-traders
a few small tweaks to travelling traders
|
2020-08-05 15:28:15 -07:00 |
|
silicons
|
ed5aa7c9f7
|
Merge pull request #12994 from kappa-sama/patch-37
removes dildo
|
2020-08-05 15:27:29 -07:00 |
|
silicons
|
bb8dfa9236
|
Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
I wanna be tracer
|
2020-08-05 15:26:37 -07:00 |
|
silicons
|
f5f0d6be81
|
Merge pull request #12990 from timothyteakettle/tongue-patch
make tongue preference pass through cloning
|
2020-08-05 15:26:04 -07:00 |
|
silicons
|
4720fedce9
|
Merge pull request #13003 from Hatterhat/crusher-glaive
Proto-Kinetic Glaives - a crusher reskin
|
2020-08-05 15:25:48 -07:00 |
|
silicons
|
164201ab27
|
Merge pull request #12956 from Arturlang/bloodsucker_death_lessspam
Makes bloodsucker death not spam now actually working
|
2020-08-05 15:15:30 -07:00 |
|
silicons
|
2d697e1867
|
Merge pull request #12926 from GlitchyCore/master
Adds a new fun round end sound
|
2020-08-05 15:14:20 -07:00 |
|
silicons
|
add9d5d0a0
|
Merge pull request #12889 from timothyteakettle/quirks-are-dumb
minor quirk changes
|
2020-08-05 15:13:52 -07:00 |
|
silicons
|
b2052a16cb
|
Merge pull request #13008 from zeroisthebiggay/powercreepislife
nukies can buy holoparasites not including support ones
|
2020-08-05 15:13:13 -07:00 |
|
silicons
|
f3e0255f7f
|
Merge pull request #13009 from Ludox235/ai-screams
Total law changes: 110
|
2020-08-05 15:12:53 -07:00 |
|
silicons
|
ffe3eeecde
|
Merge pull request #13017 from Hatterhat/coor-dharges
door charges no longer unconscious() you
|
2020-08-05 15:09:14 -07:00 |
|
silicons
|
9b14dff46b
|
Merge pull request #13025 from Trilbyspaceclone/tea
Tea Party
|
2020-08-05 15:07:55 -07:00 |
|
lolman360
|
61ed83027d
|
asj
|
2020-08-05 18:40:33 +10:00 |
|
TrilbySpaceClone
|
5d5459a318
|
Merge branch 'tea' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into tea
|
2020-08-04 10:07:10 -04:00 |
|
TrilbySpaceClone
|
f2e4b7eacc
|
grammer
|
2020-08-04 10:07:04 -04:00 |
|
Trilbyspaceclone
|
4ea05ab07e
|
Update drink_reagents.dm
|
2020-08-04 09:33:05 -04:00 |
|
TrilbySpaceClone
|
0f29235e6a
|
Tea Party
|
2020-08-04 09:15:44 -04:00 |
|
Hatterhat
|
4df9efb076
|
heho attack text
|
2020-08-04 00:29:30 -05:00 |
|
Hatterhat
|
6420914290
|
k
|
2020-08-03 23:45:34 -05:00 |
|
silicons
|
3b1826ce82
|
Update portable_turret.dm
|
2020-08-03 18:29:11 -07:00 |
|
Hatterhat
|
157d5c29a6
|
door charge nerf (tentative)
|
2020-08-03 19:47:04 -05:00 |
|
silicons
|
a4132c04ea
|
Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
|
2020-08-03 14:43:07 -07:00 |
|
silicons
|
db8abc006a
|
Merge pull request #13010 from Seris02/fixeslizards
lizards no longer break their spines ~~roundstart~~ EVER AGAIN I FUCKING FIXED THE DOUBLE SET_SPECIES LIZARD BUG
|
2020-08-03 12:54:00 -07:00 |
|
Seris02
|
5551e323cc
|
Update tails.dm
|
2020-08-03 21:41:30 +08:00 |
|
Seris02
|
82790cffed
|
fixes lizard code
|
2020-08-03 21:39:11 +08:00 |
|
silicons
|
d5a19ea4b2
|
Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
prefs for headpat wagging
|
2020-08-03 02:30:57 -07:00 |
|
Seris02
|
aeec3a3404
|
lizards no longer have broken spines
|
2020-08-03 17:29:32 +08:00 |
|
Ludox
|
f7045a55a2
|
Le shitcode has arrived.
|
2020-08-03 07:18:46 +02:00 |
|
Ludox
|
f8838d4a8c
|
Lets people fuck with the AI harder
I am a masochist.
|
2020-08-03 07:16:49 +02:00 |
|
zerothebigboy
|
d3cfa47d65
|
a
|
2020-08-02 22:27:42 -04:00 |
|
zerothebigboy
|
2d4127a9a7
|
a
|
2020-08-02 22:26:45 -04:00 |
|
zerothebigboy
|
ec2a19660a
|
a
|
2020-08-02 22:18:24 -04:00 |
|
zerothebigboy
|
35c5c2f4cd
|
a
|
2020-08-02 22:17:44 -04:00 |
|
Lin
|
2885b861f2
|
Merge pull request #12954 from silicons/killer_queen
bomb stands now use components
|
2020-08-02 12:52:07 -05:00 |
|
Hatterhat
|
ccee254546
|
proof of concept: crusherglaive - squashed
|
2020-08-02 12:30:14 -05:00 |
|
Timothy Teakettle
|
289c186f32
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-08-02 18:11:07 +01:00 |
|
Timothy Teakettle
|
03d01d917f
|
Merge branch 'master' into wounds-part-2
|
2020-08-02 18:10:31 +01:00 |
|
silicons
|
06f5ce6401
|
buffs shoving (#12925)
* ^w^
* ok
* ok
|
2020-08-02 18:30:09 +02:00 |
|
Artur
|
9dd9474164
|
Merge remote-tracking branch 'origin/master' into bloodsucker_death_lessspam
|
2020-08-02 11:12:18 +03:00 |
|
silicons
|
f0a02c2c99
|
Update _storage.dm
|
2020-08-01 23:35:42 -07:00 |
|
zerothebigboy
|
aa782f1105
|
a
|
2020-08-02 02:27:24 -04:00 |
|
zerothebigboy
|
34a8d8f798
|
a
|
2020-08-02 01:38:23 -04:00 |
|
silicons
|
65d184c552
|
Merge pull request #12999 from KeRSedChaplain/guardianfix
Removes clockwork guardian's projectile deflection. OOPS!
|
2020-08-01 21:05:52 -07:00 |
|
silicons
|
25d1fb761a
|
Merge remote-tracking branch 'citadel/master' into killer_queen
|
2020-08-01 20:51:38 -07:00 |
|
Dan-Neposh
|
6f2d4ac4df
|
makes clockwork guardians have no projectile deflection
|
2020-08-01 23:36:36 -04:00 |
|
timothyteakettle
|
d0e8393e95
|
how did this end up here
|
2020-08-02 02:00:58 +01:00 |
|
timothyteakettle
|
d05c694ffe
|
trader tweaks
|
2020-08-02 01:57:46 +01:00 |
|