fcfff59ea6
Update KiloStation.dmm
2020-03-04 20:11:28 -05:00
f5f54196d7
Update KiloStation.dmm
2020-03-04 20:04:02 -05:00
be6bebbed4
Minor elements to kilostation
...
asdf
2020-03-04 15:46:12 -05:00
c1dadec519
Automatic changelog generation for PR #11310 [ci skip]
2020-03-04 13:29:16 -06:00
1a1e362e80
Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2
...
Fixing mob holders inventory slot flags (ergo they are not glasses)
2020-03-04 13:29:13 -06:00
733cdd1c40
Automatic changelog generation for PR #11277 [ci skip]
2020-03-04 10:11:42 -06:00
7a2e0892d3
Merge pull request #11277 from kevinz000/sword_point
...
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
0b777c5efc
Automatic changelog generation for PR #11303 [ci skip]
2020-03-04 10:11:15 -06:00
6dd27506e1
Merge pull request #11303 from Citadel-Station-13/kevinz000-patch-22
...
what the fuck you mean music line too long??
2020-03-04 17:11:12 +01:00
a2fe9f0d23
Update toys.dm
2020-03-04 17:03:26 +01:00
0b74bc9da3
Update twohanded.dm
2020-03-04 16:43:57 +01:00
7c8b490cb3
Update energy.dm
2020-03-04 16:40:28 +01:00
f40af6014c
Automatic changelog generation for PR #11314 [ci skip]
2020-03-04 08:40:05 -06:00
976080d7b2
Merge pull request #11314 from KathrinBailey/Kat-Furniture
...
Kat Furniture! New sofas, chess pieces, nine new posters and shower curtain functionality!
2020-03-04 15:40:01 +01:00
8c6b5b49c5
Update contraband.dm
2020-03-04 15:39:23 +01:00
11750b4fa9
removed redundant icon line
2020-03-04 14:16:27 +00:00
dfababf692
Automatic changelog generation for PR #11321 [ci skip]
2020-03-04 07:31:12 -06:00
df5b4ab56d
Merge pull request #11321 from kevinz000/storage_components_are_bad
...
fixes storage closing while dragging, aka "this one line fix that i procrastinated giving a fuck about for about 9 months now"
2020-03-04 14:31:09 +01:00
f67fa08f0f
Merge pull request #11274 from Citadel-Station-13/Ghommie-patch-5
...
Fixing a whoopsie with airlocks.
2020-03-04 05:58:44 -07:00
5e2414bd90
fix
2020-03-03 22:25:35 -07:00
18bdb753d3
bet
2020-03-03 21:13:59 -07:00
0cf7f2e882
Update energy.dm
2020-03-03 21:07:24 -07:00
cbf2355f19
Update code/datums/elements/sword_point.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-03 21:06:05 -07:00
a883a1a7bf
Automatic changelog generation for PR #11308 [ci skip]
2020-03-03 21:28:50 -06:00
90188c51bf
Merge pull request #11308 from Putnam3145/stop-lag
...
Removes lag
2020-03-03 20:28:47 -07:00
4c68baece9
Automatic changelog generation for PR #11320 [ci skip]
2020-03-03 21:18:06 -06:00
c97fd1e41e
Merge pull request #11320 from Citadel-Station-13/Ghommie-patch-4
...
Stops ninjas employed by syndies from receiving friendly flavor objectives.
2020-03-03 19:18:03 -08:00
97733e464d
ghommie change and armrest bug fix
2020-03-04 01:35:00 +00:00
284ef326c7
Stops ninjas employed by syndies from receiving friendly flavor objectives.
2020-03-04 00:36:18 +01:00
7a539d0a78
Automatic changelog generation for PR #11289 [ci skip]
2020-03-03 14:30:17 -06:00
62eef87835
Merge pull request #11289 from Trilbyspaceclone/patch-301
...
Cotton/Durathreads now stack to 80
2020-03-03 21:30:14 +01:00
0b5481f9b9
Merge pull request #11237 from kevinz000/reagent_logging_3
...
reagent logging pr attempt 3 but it works
2020-03-03 21:27:17 +01:00
86790c69a5
credits accidently left out previously
...
re-adds nod to CEV Eris for their original sprites.
2020-03-03 14:38:16 +00:00
7e0abda3c1
fixing merge conflicts
...
includes trillby's new posters.
2020-03-03 13:56:01 +00:00
83ec1e428c
Merge remote-tracking branch 'upstream/master' into Kat-Furniture
2020-03-03 13:48:18 +00:00
fe7742637f
fixing merge conflicts aaahh
2020-03-03 13:47:58 +00:00
d32b6ad7e9
ok
2020-03-03 08:47:17 -05:00
a240daaca2
Final changes
...
Puts curtain crafting under plastic to stop plastic duping. You can deep rods and cloth, but the cost is 10 plastic sheets and it doesn't drop 10 plastic sheets so it's a loss.
2020-03-03 13:19:15 +00:00
107a6434fd
Merge pull request #11305 from Citadel-Station-13/kevinz000-patch-23
...
you can no longer stamcrit a goddamn xenomorph come on citadel why is this a thing
2020-03-03 13:36:52 +01:00
9027f04691
Automatic changelog generation for PR #11203 [ci skip]
2020-03-03 06:29:56 -06:00
f9a2326437
Merge pull request #11203 from Trilbyspaceclone/poster
...
Three new posters!
2020-03-03 13:29:54 +01:00
14c1057148
Automatic changelog generation for PR #11250 [ci skip]
2020-03-03 06:26:22 -06:00
81bb6978de
Merge pull request #11250 from Seris02/risingbassnerf
...
Rising bass nerfs and fixes
2020-03-03 13:26:19 +01:00
6869f5526d
Automatic changelog generation for PR #11299 [ci skip]
2020-03-03 06:24:35 -06:00
6da3cf3bbb
Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1
...
fix flypeople nutrition
2020-03-03 13:24:32 +01:00
d679dc662c
Automatic changelog generation for PR #11300 [ci skip]
2020-03-03 06:24:18 -06:00
294668d6e1
Merge pull request #11300 from kappa-sama/patch-11
...
removes obsolete laptop slowdown
2020-03-03 13:24:15 +01:00
c7fe9d31e2
Merge pull request #11311 from Citadel-Station-13/kevinz000-patch-19
...
*HELPS* with the atrocious GC situation regarding blobs
2020-03-03 13:23:28 +01:00
3a80d59330
Merge pull request #11312 from Citadel-Station-13/kevinz000-patch-24
...
Fixes a bug with garbage collection
2020-03-03 13:23:12 +01:00
0adaa514f0
Merge pull request #11313 from Citadel-Station-13/kevinz000-patch-25
...
Fixes people in soft critical moving far slower than they should be
2020-03-03 13:22:55 +01:00
MrJWhit